diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..74d6a4f
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+David Kilias <dkdent@netz39.de>
+David Kilias <dkdent@netz39.de> <david.kilias@gmail.com>
+Stefan Haun <tux@netz39.de>