diff --git a/.mailmap b/.mailmap
index 52d050618..db01768d2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,10 +1,18 @@
+Behdad Esfahbod (بهداد اسفهبد) <behdad@behdad.org> <behdad.esfahbod@gmail.com>
+Behdad Esfahbod (بهداد اسفهبد) <behdad@behdad.org> <behdad@google.com>
+Behdad Esfahbod (بهداد اسفهبد) <behdad@behdad.org>
+Ewald Hew (Hew Yih Shiuan 丘毅宣) <ewaldhew@gmail.com>
 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>
+Nikhil Ramakrishnan (निखिल रामकृष्णन) <ramakrishnan.nikhil@gmail.com>
+Dominik Röttsches <drott@chromium.org> <drott@google.com>
+Kostya Serebryany <kcc@google.com> <konstantin.s.serebryany@gmail.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>
+Bram Tassyns <bramt@enfocus.be> bram tassyns <BramT@enfocus.be>
+Bram Tassyns <bramt@enfocus.be> <BramT@enfocus.com>
+David Turner <david@freetype.org> <david.turner.dev@gmail.com>
+David Turner <david@freetype.org> <digit@google.com>
 Ben Wagner <bungeman@gmail.com> Bungeman <bungeman@gmail.com>
-Ewald Hew (Hew Yih Shiuan 丘毅宣) <ewaldhew@gmail.com>
-Nikhil Ramakrishnan (निखिल रामकृष्णन) <ramakrishnan.nikhil@gmail.com>
+Ben Wagner <bungeman@gmail.com> <bungeman@google.com>
+Nikolaus Waxweiler <madigens@gmail.com> <nikolaus.waxweiler@daltonmaag.com>