diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..bd23a6e51
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,6 @@
+Gregor Kleen <gregor.kleen@ifi.lmu.de> <kleen@cip.ifi.lmu.de>
+Gregor Kleen <gregor.kleen@ifi.lmu.de> <gkleen@yggdrasil.li>
+Felix Hamann <felix.hamann@campus.lmu.de> <felix.hamann@satellytes.com>
+Steffen Jost <jost@tcs.ifi.lmu.de> <jost@tcs.ifi.lmu.de>
+Sarah Vaupel <vaupel.sarah@campus.lmu.de> <vaupel@cip.ifi.lmu.de>
+Sarah Vaupel <vaupel.sarah@campus.lmu.de> Sarah Vaupel <>
\ No newline at end of file