diff --git a/.mailmap b/.mailmap
index 458458f3bac..3734a39085e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,6 +4,7 @@ Aaron Heckmann <aaron.heckmann@gmail.com> <aaron.heckmann+github@gmail.com>
 Aayush Ahuja <aayush.a@directi.com>
 Abe Fettig <abefettig@gmail.com> <abe@fettig.net>
 Abhimanyu Vashisht <abhimanyuvashisht.av@gmail.com>
+Adam Langley <agl@imperialviolet.org> <agl@google.com>
 Akhil Marsonya <akhil.marsonya27@gmail.com>
 Akhil Marsonya <akhil.marsonya27@gmail.com> <16393876+marsonya@users.noreply.github.com>
 Akito Ito <akito0107@gmail.com> <akito_ito@r.recruit.co.jp>
diff --git a/AUTHORS b/AUTHORS
index 0ac475b8289..db7f5daab4c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -908,7 +908,7 @@ Jeff Harris <techjeffharris@gmail.com>
 Alexander Makarenko <estliberitas@gmail.com>
 Drew Folta <drew@folta.net>
 Dmitriy Lazarev <wKich@users.noreply.github.com>
-Adam Langley <agl@google.com>
+Adam Langley <agl@imperialviolet.org>
 Kári Tristan Helgason <kthelgason@gmail.com>
 Manuel Valls <manolo@vlrz.es>
 Prayag Verma <prayag.verma@gmail.com>