diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..9b7fbdf704
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,27 @@
+Carsten Elton Sørensen <ces@HADDOCK.premitech.net>
+Carsten Elton Sørensen <csoren@gmail.com>
+Dain Darnell <dain.darnell@readytalk.com>
+Dain Darnell <dain@dazar.(none)>
+Edison Guo <hydra1983@gmail.com>
+Jason Treadwell <derBierBrauer@yahoo.com>
+Jason Treadwell <jason.treadwell@readytalk.com>
+Jason Treadwell <jet@debian-armel.(none)>
+Jason Treadwell <jet@jet-lappy.(none)>
+Jason Treadwell <jet@jet.ecovate.com>
+Jason Treadwell <jet@jet.readytalk.com>
+Jason Treadwell <jet@jetl.readytalk.com>
+Jason Treadwell <jet@jetp.(none)>
+Jason Treadwell <jet@nonames-power-mac-g4-agp-graphics.local>
+Joel Dice <Joel Dice@joeldicexpvm.(none)>
+Joel Dice <Joel@JDICEVM7.(none)>
+Joel Dice <anonymous@example.com>
+Joel Dice <dicej@bstevenstestnb.readytalk.com>
+Joel Dice <dicej@osxdesktop-2.local>
+Joshua Warner <jwarner@radio.ecovate.com>
+Matt Weaver <mweaver@gorgotron.readytalk.com>
+Mike Jensen <jentfoo@gmail.com>
+Mike Jensen <mjensen@jentbox.ecovate.com>
+Mike Jensen <mjensen@lennyjent.ecovate.com>
+Terek Campbell <terek.campbell@colorado.edu>
+Thiago Bedin Frustaci <frustaci@gmail.com>
+Zsombor Gegesy <gzsombor@gmail.com>