diff --git a/.mailmap b/.mailmap
index 2af2d7cd9b..f5147dd040 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,6 +16,7 @@
 <jmckenty@gmail.com> <jmckenty@joshua-mckentys-macbook-pro.local>
 <jmckenty@gmail.com> <joshua.mckenty@nasa.gov>
 <justin@fathomdb.com> <justinsb@justinsb-desktop>
+<masumotok@nttdata.co.jp> <root@openstack2-api> <masumotok@nttdata.co.jp> Masumoto<masumotok@nttdata.co.jp>
 <mordred@inaugust.com> <mordred@hudson>
 <paul@openstack.org> <pvoccio@castor.local>
 <paul@openstack.org> <paul.voccio@rackspace.com>
diff --git a/Authors b/Authors
index 82e07a6b58..aa91124f74 100644
--- a/Authors
+++ b/Authors
@@ -26,7 +26,7 @@ Josh Durgin <joshd@hq.newdream.net>
 Josh Kearney <josh.kearney@rackspace.com>
 Joshua McKenty <jmckenty@gmail.com>
 Justin Santa Barbara <justin@fathomdb.com>
-Kei Masumoto <masumotok@nttdata.co.jp>
+Kei Masumoto <masumotok@nttdata.co.jp> 
 Ken Pepple <ken.pepple@gmail.com>
 Koji Iida <iida.koji@lab.ntt.co.jp>
 Lorin Hochstein <lorin@isi.edu>