diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..6b6579186
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,10 @@
+Tobias Doerffel <tobias.doerffel@gmail.com>
+Paul Giblock <drfaygo@gmail.com> <pgib@users.sf.net>
+Paul Giblock <drfaygo@gmail.com> <p@pgiblock.net>
+Andrew Kelley <superjoe30@gmail.com> <andrew.r.kelley@gmail.com>
+Andrew Kelley <superjoe30@gmail.com> <andy@debian.superjoesoftware>
+Janne Sinisalo <janne.m.sinisalo@gmail.com> <janne@janne-desktop.(none)>
+Raine M. Ekman <raine@iki.fi> <raine@raine.(none)>
+Raine M. Ekman <raine@iki.fi> <raine@raine.damex.fi>
+Lukas W <lukaswhl@googlemail.com> <lukaswhl@gmail.com>
+Vesa <contact.diizy@nbl.fi> <vesa@isokone.(none)>