diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..46145f81
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
+Pietro Berkes <berkes@berkestop.(none)>
+Michael Schmuker <m.schmuker@fu-berlin.de>