diff --git a/.mailmap b/.mailmap
index 4c40062fc2..becc2207a1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -114,3 +114,4 @@ Cheng Li <shcli@cn.ibm.com>
 Nandini Tata <nandini.tata@intel.com> <nandini.tata.15@gmail.com>
 Flavio Percoco <flaper87@gmail.com>
 Tin Lam <tinlam@gmail.com> <tl3438@att.com>
+Hisashi Osanai <osanai.hisashi@jp.fujitsu.com> <osanai.hisashi@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 0eef542b6d..637021b075 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,6 +20,7 @@ Florian Hines (syn@ronin.io)
 Greg Holt (gholt@rackspace.com)
 Paul Luse (paul.e.luse@intel.com)
 Donagh McCabe (donagh.mccabe@gmail.com)
+Hisashi Osanai (osanai.hisashi@gmail.com)
 Jay Payne (letterj@gmail.com)
 Peter Portante (peter.portante@redhat.com)
 Will Reese (wreese@gmail.com)
@@ -153,7 +154,6 @@ Hanxi Liu (hanxi.liu@easystack.cn)
 Harshada Mangesh Kakad (harshadak@metsi.co.uk)
 Harshit Chitalia (harshit@acelio.com)
 hgangwx (hgangwx@cn.ibm.com)
-Hisashi Osanai (osanai.hisashi@jp.fujitsu.com)
 Hodong Hwang (hodong.hwang@kt.com)
 Hou Ming Wang (houming.wang@easystack.cn)
 houweichao (houwch@gohighsec.com)