diff --git a/.mailmap b/.mailmap
index 4f9e4e62c65e..84e31bf536d3 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>
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/nova/commit/389764174e8e9a14cceb2a114f5d093c49e7529e.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/nova/commit/389764174e8e9a14cceb2a114f5d093c49e7529e.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>