diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..114bb10f
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+# Format is:
+# Name <preferred e-mail> <other e-mail >
+Joe Gordon <joe.gordon0@gmail.com> <jogo@cloudscaling.com>