diff --git a/.mailmap b/.mailmap
index e5ced35eb..e5a909861 100644
--- a/.mailmap
+++ b/.mailmap
@@ -41,7 +41,8 @@
 <matt.dietz@rackspace.com> <mdietz@openstack>
 <mordred@inaugust.com> <mordred@hudson>
 <naveedm9@gmail.com> <naveed.massjouni@rackspace.com>
-<nirmal.ranganathan@rackspace.com> <nirmal.ranganathan@rackspace.coom>
+<rnirmal@gmail.com> <nirmal.ranganathan@rackspace.com>
+<rnirmal@gmail.com> <nirmal.ranganathan@rackspace.coom>
 <paul@openstack.org> <paul.voccio@rackspace.com>
 <paul@openstack.org> <pvoccio@castor.local>
 <paul@openstack.org> <paul@substation9.com>
diff --git a/Authors b/Authors
index 7930898b9..574a34f30 100644
--- a/Authors
+++ b/Authors
@@ -123,7 +123,7 @@ Muneyuki Noguchi <noguchimn@nttdata.co.jp>
 Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
 Naveed Massjouni <naveedm9@gmail.com>
 Nikolay Sokolov <nsokolov@griddynamics.com>
-Nirmal Ranganathan <nirmal.ranganathan@rackspace.com>
+Nirmal Ranganathan <rnirmal@gmail.com>
 Ollie Leahy <oliver.leahy@hp.com>
 Pádraig Brady <pbrady@redhat.com>
 Paul Voccio <paul@openstack.org>