diff --git a/.mailmap b/.mailmap
index 131ed7bb47..e0f1650d65 100644
--- a/.mailmap
+++ b/.mailmap
@@ -20,7 +20,8 @@ Chris McMahon <cmcmahon@wikimedia.org>
 Christian Williams <orbit@framezero.com>
 Christian Williams <orbit@framezero.com> <christian@localhost>
 Christian Williams <orbit@framezero.com> <christian@wikia-inc.com>
-David Chan <david@sheetmusic.org.uk>
+David Chan <david@troi.org>
+David Chan <david@troi.org> <david@sheetmusic.org.uk>
 Ed Sanders <esanders@wikimedia.org>
 Erik Moeller <erik@wikimedia.org>
 Erik Moeller <erik@wikimedia.org> <erik@users.mediawiki.org>
@@ -63,7 +64,8 @@ Siebrand Mazeland <s.mazeland@xs4all.nl> <siebrand@users.mediawiki.org>
 Siebrand Mazeland <s.mazeland@xs4all.nl> <siebrand@wikimedia.org>
 Subramanya Sastry <ssastry@wikimedia.org>
 Sucheta Ghoshal <sghoshal@wikimedia.org>
-Thalia Chan <thalia@cantorion.org>
+Thalia Chan <thalia.e.chan@googlemail.com>
+Thalia Chan <thalia.e.chan@googlemail.com> <thalia@cantorion.org>
 Timo Tijhof <krinklemail@gmail.com>
 Timo Tijhof <krinklemail@gmail.com> <timo@wikimedia.org>
 Timo Tijhof <krinklemail@gmail.com> <ttijhof@wikimedia.org>