diff --git a/.mailmap b/.mailmap
index 4f9e4e62c6..84e31bf536 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,10 +8,12 @@
 <anotherjesse@gmail.com> <jesse@aire.local>
 <ant@openstack.org> <amesserl@rackspace.com>
 <Armando.Migliaccio@eu.citrix.com> <armando.migliaccio@citrix.com>
+<brian.elliott@rackspace.com> <bdelliott@gmail.com>
 <brian.lamar@rackspace.com> <brian.lamar@gmail.com>
 <brian.waldon@rackspace.com> <bcwaldon@gmail.com>
 <bschott@isi.edu> <bfschott@gmail.com>
 <cbehrens@codestud.com> <chris.behrens@rackspace.com>
+<cbehrens@codestud.com> <cbehrens+github@codestud.com>
 <chiradeep@cloud.com> <chiradeep@chiradeep-lt2>
 <code@term.ie> <github@anarkystic.com>
 <code@term.ie> <termie@preciousroy.local>