diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000000000000000000000000000000000..007e7bea360ea91d223a8c1185bd8c52cda25b68
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Piotr Benedysiuk <benedysiuk.piotr@gmail.com>
+Toeno van der Sar <t.vandersar@tudelft.nl>
diff --git a/AUTHORS.md b/AUTHORS.md
new file mode 100644
index 0000000000000000000000000000000000000000..c1e5ce2cf435533b53670d35da87be516dafc4d7
--- /dev/null
+++ b/AUTHORS.md
@@ -0,0 +1,16 @@
+The following people contributed to making of these lecture notes:
+
+* Anton Akhmerov
+* Bas Nijholt
+* Iacopo Bertelli
+* Joana Fraxanet Morales
+* Piotr Benedysiuk
+* Sander Otte
+* Toeno van der Sar
+
+<!--
+Execute
+git shortlog -s | sed -e "s/^ *[0-9\t ]*//"| xargs -i sh -c 'grep -q "{}" AUTHORS.md || echo "{}"'
+
+To check if any authors are missing from this list.
+ -->