diff --git a/.mailmap b/.mailmap
index c305619fa84746..b3bbe84e270693 100644
--- a/.mailmap
+++ b/.mailmap
@@ -198,6 +198,7 @@ Jérémy Lal <kapouer@melix.org> <holisme@gmail.com>
 Jerry Chin <qinjia@outlook.com>
 Jessica Quynh Tran <jessica.quynh.tran@gmail.com>
 Jesús Leganés-Combarro 'piranna <piranna@gmail.com>
+Jimb Esser <wasteland@gmail.com> <jimb@railgun3d.com>
 Joe Shaw <joe@joeshaw.org> <joeshaw@litl.com>
 Johan Bergström <bugs@bergstroem.nu>
 Johan Dahlberg <jfd@distrop.com> <dahlberg.johan@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 83b42c5d4bc66e..00d5a3feb97fe9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -292,7 +292,7 @@ Ted Young <ted@radicaldesigns.org>
 Joshua Holbrook <josh.holbrook@gmail.com>
 Blake Miner <miner.blake@gmail.com>
 Vincent Ollivier <contact@vincentollivier.com>
-Jimb Esser <jimb@railgun3d.com>
+Jimb Esser <wasteland@gmail.com>
 Sambasiva Suda <sambasivarao@gmail.com>
 Sadique Ali <sadiqalikm@gmail.com>
 Dmitry Nizovtsev <dmitry@ukrteam.com>
@@ -895,7 +895,6 @@ Glen Arrowsmith <glen.arrowsmith@gmail.com>
 Jeff Harris <techjeffharris@gmail.com>
 Alexander Makarenko <estliberitas@gmail.com>
 Drew Folta <drew@folta.net>
-Jimb Esser <wasteland@gmail.com>
 Dmitriy Lazarev <wKich@users.noreply.github.com>
 Adam Langley <agl@google.com>
 Kári Tristan Helgason <kthelgason@gmail.com>