diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..6b9f5bc
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+# https://git-scm.com/docs/gitmailmap
+# This file isn't supported by GitHub (yet?) but maybe someday
+<ned@nedbatchelder.com> <ned@edx.org>