diff --git a/.mailmap b/.mailmap
index ccf2109a..7e031fc7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,6 +4,7 @@
 <anotherjesse@gmail.com> <jesse@dancelamb>
 <anotherjesse@gmail.com> <jesse@gigantor.local>
 <anotherjesse@gmail.com> <jesse@ubuntu>
+<anotherjesse@gmail.com> <jesse@aire.local>
 <ant@openstack.org> <amesserl@rackspace.com>
 <Armando.Migliaccio@eu.citrix.com> <armando.migliaccio@citrix.com>
 <brian.lamar@rackspace.com> <brian.lamar@gmail.com>
diff --git a/Authors b/Authors
index 2de4fb95..f4b40a85 100644
--- a/Authors
+++ b/Authors
@@ -74,5 +74,6 @@ Trey Morris <trey.morris@rackspace.com>
 Tushar Patil <tushar.vitthal.patil@gmail.com>
 Vasiliy Shlykov <vash@vasiliyshlykov.org>
 Vishvananda Ishaya <vishvananda@gmail.com>
+Yoshiaki Tamura <yoshi@midokura.jp>
 Youcef Laribi <Youcef.Laribi@eu.citrix.com>
 Zhixue Wu <Zhixue.Wu@citrix.com>