diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..a1401298
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+<douglas.mendizabal@rackspace.com> <dougmendizabal@gmail.com>
+<jarret.raim@rackspace.com> <jarito@gmail.com>
+John Wood <john.wood@rackspace.com> jfwood