diff --git a/.mailmap b/.mailmap
index c6f6c9a8b6..95bf1a1bc1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -34,3 +34,4 @@
 <ant@openstack.org> <amesserl@rackspace.com>
 <chiradeep@cloud.com> <chiradeep@chiradeep-lt2>
 <justin@fathomdb.com> <superstack@superstack.org>
+<naveedm9@gmail.com> <naveed.massjouni@rackspace.com>
diff --git a/Authors b/Authors
index b359fec221..168a3cf9ab 100644
--- a/Authors
+++ b/Authors
@@ -42,6 +42,7 @@ Monty Taylor <mordred@inaugust.com>
 MORITA Kazutaka <morita.kazutaka@gmail.com>
 Muneyuki Noguchi <noguchimn@nttdata.co.jp>
 Nachi Ueno <ueno.nachi@lab.ntt.co.jp> <openstack@lab.ntt.co.jp> <nati.ueno@gmail.com> <nova@u4>
+Naveed Massjouni <naveedm9@gmail.com>
 Paul Voccio <paul@openstack.org>
 Ricardo Carrillo Cruz <emaildericky@gmail.com>
 Rick Clark <rick@openstack.org>