diff --git a/.mailmap b/.mailmap
index 2f97343e..2265c2e2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -41,7 +41,7 @@
 <nirmal.ranganathan@rackspace.com> <nirmal.ranganathan@rackspace.coom>
 <paul@openstack.org> <paul.voccio@rackspace.com>
 <paul@openstack.org> <pvoccio@castor.local>
-<rconradharris@gmail.com> <rick.harris@rackspace.com> 
+<rconradharris@gmail.com> <rick.harris@rackspace.com>
 <rlane@wikimedia.org> <laner@controller>
 <sandy.walsh@rackspace.com> <sandy@sandywalsh.com>
 <sleepsonthefloor@gmail.com> <root@tonbuntu>
@@ -49,6 +49,7 @@
 <throughnothing@gmail.com> <will.wolf@rackspace.com>
 <todd@ansolabs.com> <todd@lapex>
 <todd@ansolabs.com> <todd@rubidine.com>
+<trey.morris@rackspace.com> <treyemorris@gmail.com>
 <tushar.vitthal.patil@gmail.com> <tpatil@vertex.co.in>
 <ueno.nachi@lab.ntt.co.jp> <nati.ueno@gmail.com>
 <ueno.nachi@lab.ntt.co.jp> <nova@u4>