diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..a3c5f9451
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,7 @@
+Alexei Podtelezhnikov (Алексей Подтележников) <apodtele@gmail.com>
+Behdad Esfahbod <behdad@behdad.org> <behdad.esfahbod@gmail.com>
+Bram Tassyns <bramt@enfocus.be> bram tassyns <BramT@enfocus.be>
+Bram Tassyns <bramt@enfocus.be> <BramT@enfocus.com>
+Suzuki, Toshiya (鈴木俊哉) <mpsuzuki@hiroshima-u.ac.jp> <sssa@flavor1.ipc.hiroshima-u.ac.jp>
+Suzuki, Toshiya (鈴木俊哉) <mpsuzuki@hiroshima-u.ac.jp> sssa <sssa@IPA2004-mps.local>
+Suzuki, Toshiya (鈴木俊哉) <mpsuzuki@hiroshima-u.ac.jp> suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>