diff --git a/openstack-config/email-map b/openstack-config/email-map
index 6b408aa..46165d4 100644
--- a/openstack-config/email-map
+++ b/openstack-config/email-map
@@ -33,7 +33,8 @@ jake@ansolabs.com Rackspace < 2012-07-20
 jaypipes@gmail.com AT&T
 jaypipes@gmail.com HP < 2012-06-04
 jaypipes@gmail.com Rackspace < 2011-12-01
-jeblair@openstack.org OpenStack Foundation
+jeblair@openstack.org HP
+jeblair@openstack.org OpenStack Foundation < 2014-06-04
 jeblair@openstack.org HP < 2012-12-08
 jeblair@opensack.org Rackspace < 2011-12-01
 joe.gordon0@gmail.com HP
diff --git a/openstack-config/groups/foundation b/openstack-config/groups/foundation
index 4674859..4fb0bfb 100644
--- a/openstack-config/groups/foundation
+++ b/openstack-config/groups/foundation
@@ -1,2 +1 @@
 fungi@yuggoth.org
-jeblair@openstack.org
diff --git a/openstack-config/groups/hp b/openstack-config/groups/hp
index 5ce903a..c7eded4 100644
--- a/openstack-config/groups/hp
+++ b/openstack-config/groups/hp
@@ -25,3 +25,4 @@ steven@wedontsleep.org
 gleebix@gmail.com
 code@gentlydownthe.net
 morgan.fainberg@gmail.com
+jeblair@hp.com