diff --git a/.mailmap b/.mailmap
index c656f64c7..8479cf6c4 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,6 +16,7 @@ Xavier L. <xavier.l@afrosoft.tk> <xavier.l@afrosoft.tk>
 Sascha Cunz <sascha@babbelbox.org> <Sascha@BabbelBox.org>
 Authmillenon <authmillenon@googlemail.com> <martin@ucsmail.de>
 Authmillenon <authmillenon@googlemail.com> <authmillenon@googlemail.com>
-Edward Thomson <ethomson@microsoft.com> <ethomson@edwardthomson.com>
+Edward Thomson <ethomson@github.com> <ethomson@microsoft.com>
+Edward Thomson <ethomson@github.com> <ethomson@edwardthomson.com>
 J. David Ibáñez <jdavid.ibp@gmail.com> <jdavid@itaapy.com>
 Russell Belfer <rb@github.com> <arrbee@arrbee.com>