diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..0b99ec635
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,7 @@
+Diego Elio Pettenò <flameeyes@gmail.com>
+Lennart Poettering <mzfuryy@0pointer.net>
+Lennart Poettering <lennart@poettering.net>
+Russ Dill <Russ.Dill@asu.edu>
+Russ Dill <russ.dill@gmail.com>
+Sjoerd Simons <sjoerd@luon.net>
+Sjoerd Simons <sjoerd@debian.org>