diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..04abdc4ed
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,5 @@
+# Format is:
+# <preferred e-mail> <other e-mail 1>
+# <preferred e-mail> <other e-mail 2>
+<mr.alex.meade@gmail.com> <hatboy112@yahoo.com>
+<mr.alex.meade@gmail.com> <alex.meade@rackspace.com>