diff --git a/.mailmap b/.mailmap
index 458458f3bacf76..3734a39085e322 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 0ac475b8289dc0..19d72b97226b61 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>
@@ -3595,5 +3595,11 @@ Aaron Friel <mayreply@aaronfriel.com>
 Vaishno Chaitanya <vaishnochaitanya7@gmail.com>
 Jonathan Diaz <50384299+jdiaz-dev@users.noreply.github.com>
 Mike Roth <mike_roth@safetrekapp.com>
+Almeida <almeidx@pm.me>
+Kevin Eady <8634912+KevinEady@users.noreply.github.com>
+Mordy Tikotzky <mordytk@gmail.com>
+vitpavlenko <vitaliypavlenko01@gmail.com>
+Tim Gerk <tgerk@users.noreply.github.com>
+Suyash Nayan <89125422+7suyash7@users.noreply.github.com>
 
 # Generated by tools/update-authors.mjs