diff --git a/.gitignore b/.gitignore
index d9bc9cd..5ea5d67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 # but we _wan't_ those dot-files
 !.gitignore
 !.hgignore
+!.mailmap
 
 # ChangeLog is generated during make
 /ChangeLog
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..4562e32
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,6 @@
+Axel Beckert <abe@deuxchevaux.org>
+Dmitry Nedospasov <dmitry@nedos.net>
+Nathan O'Sullivan <nathan@mammoth.com.au>
+Radu Spineanu <radu@debian.org> radu <none@none>
+Steve Kemp <steve@steve.org.uk> steve <none@none>
+Stéphane Jourdois <sjourdois@gmail.com> <stephane@jourdois.fr>