diff --git a/openstack-config/aliases b/openstack-config/aliases
index f9a1906..b7c16d2 100644
--- a/openstack-config/aliases
+++ b/openstack-config/aliases
@@ -19,8 +19,9 @@ chuck.short@canonical.com zulcss@ubuntu.com
 clay.gerrard@gmail.com clay.gerrard@gmail.com
 clay.gerrard@rackspace.com clay.gerrard@gmail.com
 clayg@clayg-desktop clay.gerrard@gmail.com
-corvus@gnu.org jeblair@hp.com
-corvus@inaugust.com jeblair@hp.com
+jeblair@hp.com jeblair@openstack.org
+corvus@gnu.org jeblair@openstack.org
+corvus@inaugust.com jeblair@openstack.org
 cory.wright@rackspace.com corywright@gmail.com
 dan.prince@rackspace.com dprince@redhat.com
 danwent@dan-xs3-cs dan@nicira.com
diff --git a/openstack-config/domain-map b/openstack-config/domain-map
index 68e01da..b3b3c2b 100644
--- a/openstack-config/domain-map
+++ b/openstack-config/domain-map
@@ -45,6 +45,7 @@ nttdata.com NTT
 nttdata.co.jp NTT
 nttmcl.com NTT
 vertex.co.in NTT
+openstack.org OpenStack Foundation
 pistoncloud.com Piston Cloud
 rackspace.co.uk Rackspace
 rackspace.com Rackspace
diff --git a/openstack-config/email-map b/openstack-config/email-map
index 8c681c1..b8ae2fd 100644
--- a/openstack-config/email-map
+++ b/openstack-config/email-map
@@ -21,8 +21,9 @@ 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@hp.com HP
-jeblair@hp.com Rackspace < 2011-12-01
+jeblair@openstack.org OpenStack Foundation
+jeblair@openstack.org HP < 2012-12-08
+jeblair@opensack.org Rackspace < 2011-12-01
 lzyeval@gmail.com Intel
 lzyeval@gmail.com SINA < 2012-06-19
 me@not.mn SwiftStack
diff --git a/openstack-config/groups/foundation b/openstack-config/groups/foundation
new file mode 100644
index 0000000..dcf6ed1
--- /dev/null
+++ b/openstack-config/groups/foundation
@@ -0,0 +1 @@
+jeblair@openstack.org