diff --git a/.mailmap b/.mailmap
index a1401298..d27c00fb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,5 @@
-<douglas.mendizabal@rackspace.com> <dougmendizabal@gmail.com>
+Douglas Mendizábal <douglas@redrobot.io> <douglas.mendizabal@rackspace.com>
+Douglas Mendizábal <douglas@redrobot.io> <dougmendizabal@gmail.com>
+Douglas Mendizábal <douglas@redrobot.io> <mail@doug.gt>
 <jarret.raim@rackspace.com> <jarito@gmail.com>
 John Wood <john.wood@rackspace.com> jfwood