diff --git a/.mailmap b/.mailmap
index a4e417789a1bff..7fc4c2eb058a59 100644
--- a/.mailmap
+++ b/.mailmap
@@ -142,7 +142,8 @@ Felix Geisendörfer <felix@debuggable.com>
 Felix Geisendörfer <felix@debuggable.com>
 Flandre Scarlet <panyilinlove@qq.com>
 Florian Margaine <florian@margaine.com>
-Forrest L Norvell <forrest@npmjs.com> <ogd@aoaioxxysz.net>
+Forrest L Norvell <othiym23@gmail.com> <forrest@npmjs.com>
+Forrest L Norvell <othiym23@gmail.com> <ogd@aoaioxxysz.net>
 Franziska Hinkelmann <franziska.hinkelmann@gmail.com> <fhinkel@vt.edu>
 Friedemann Altrock <frodenius@gmail.com>
 Fuji Goro <gfuji@cpan.org>
diff --git a/AUTHORS b/AUTHORS
index e3a46e52c57c4b..db6ce4f9929cd5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -471,7 +471,7 @@ David Björklund <david.bjorklund@gmail.com>
 Dav Glass <davglass@gmail.com>
 Andrew Chilton <andychilton@gmail.com>
 Antony Bailey <support@antonybailey.net>
-Forrest L Norvell <forrest@npmjs.com>
+Forrest L Norvell <othiym23@gmail.com>
 Evan Solomon <evan@evanalyze.com>
 Eran Hammer <eran@hueniverse.com>
 Matthias Bartelmeß <mba@fourplusone.de>