diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..4f386b91
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,10 @@
+Benjamin Reed <rangerrick@befunk.com> Benjamin Reed <ranger@befunk.com>
+Benjamin Reed <rangerrick@befunk.com> Benjamin Reed <ranger@Sin.local>
+Christian Dywan <christian.dywan@lanedo.com> Christian Dywan <christian@lanedo.com>
+Colin Walters <walters@verbum.org> Colin Walters <walters@lightbox.localdomain>
+Colin Walters <walters@verbum.org> Colin Walters <walters@space-ghost.verbum.private>
+Havoc Pennington <hp@pobox.com> Havoc Pennington <hp@localhost.localdomain>
+Ralf Habacker <ralf.habacker@freenet.de> Ralf Habacker <Ralf.Habacker@freenet.de>
+Ralf Habacker <ralf.habacker@freenet.de> Ralf Habacker <ralf@s15291359.onlinehome-server.info>
+Ralf Habacker <ralf.habacker@freenet.de> unknown <Administrator@.(none)>
+Ralf Habacker <ralf.habacker@freenet.de> unknown <Habacker@.(none)>