diff --git a/.mailmap b/.mailmap
index 681bd646a3..664d4a6cca 100644
--- a/.mailmap
+++ b/.mailmap
@@ -41,3 +41,4 @@ Julien Danjou <julien@danjou.info> <julien.danjou@enovance.com>
 David Hadas <davidh@il.ibm.com> <david.hadas@gmail.com>
 Yaguang Wang <yaguang.wang@intel.com> ywang19 <yaguang.wang@intel.com>
 Liu Siqi <meizu647@gmail.com> dk647 <meizu647@gmail.com>
+James E. Blair <jeblair@openstack.org> <james.blair@rackspace.com>
diff --git a/AUTHORS b/AUTHORS
index 8bc11abf9d..079349860e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,7 +20,7 @@ Jesse Andrews (anotherjesse@gmail.com)
 Joe Arnold (joe@swiftstack.com)
 Ionuț Arțăriși (iartarisi@suse.cz)
 Darrell Bishop (darrell@swiftstack.com)
-James E. Blair (james.blair@rackspace.com)
+James E. Blair (jeblair@openstack.org)
 Chmouel Boudjnah (chmouel@enovance.com)
 Clark Boylan (clark.boylan@gmail.com)
 Russell Bryant (rbryant@redhat.com)