diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..e0f587ff5
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,6 @@
+PatR <rankin@nethack.org>              nethack.rankin <nethack.rankin>
+nhmall <mjnh@persona.ca>               nethack.allison <nethack.allison>
+keni <keni@his.com>                    keni <keni>
+David Cohrs <davecohrs@gmail.com>      cohrs <cohrs>
+Derek S. Ray <derekray@gmail.com>      Derek <derekray@gmail.com>
+Alex Kompel <barbos+nethack@gmail.com> Alex Kompel <barbos+droidzebra@gmail.com>