diff --git a/.mailmap b/.mailmap
index 47f0ce0172..6c716342af 100644
--- a/.mailmap
+++ b/.mailmap
@@ -53,3 +53,4 @@ Peter Portante <peter.portante@redhat.com> <peter.a.portante@gmail.com>
 Christian Schwede <info@cschwede.de> <christian.schwede@enovance.com>
 Constantine Peresypkin <constantine.peresypk@rackspace.com> <constantine@litestack.com>
 Madhuri Kumari <madhuri.rai07@gmail.com> madhuri <madhuri@madhuri-VirtualBox.(none)>
+Morgan Fainberg <morgan.fainberg@gmail.com> <m@metacloud.com>
diff --git a/AUTHORS b/AUTHORS
index 8055fdeac0..7fcfd84511 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -39,7 +39,7 @@ Brian Curtin (brian.curtin@rackspace.com)
 Julien Danjou (julien@danjou.info)
 Ksenia Demina (kdemina@mirantis.com)
 Dan Dillinger (dan.dillinger@sonian.net)
-Morgan Fainberg (m@metacloud.com)
+Morgan Fainberg (morgan.fainberg@gmail.com)
 ZhiQiang Fan (aji.zqfan@gmail.com)
 Flaper Fesp (flaper87@gmail.com)
 Tom Fifield (tom@openstack.org)