diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..a09ac47767
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,17 @@
+Alex Monk <krenair@gmail.com>
+Alex Monk <krenair@gmail.com> <krenair@wikimedia.org>
+Bartosz Dziewoński <matma.rex@gmail.com>
+Christian Williams <christian@wikia-inc.com>
+David Chan <david@sheetmusic.org.uk>
+Ed Sanders <esanders@wikimedia.org>
+Inez Korczynski <inez@wikia-inc.com>
+James D. Forrester <jforrester@wikimedia.org>
+Marielle Volz <marielle.volz@gmail.com>
+Moriel Schottlender <moriel@gmail.com>
+Roan Kattouw <roan.kattouw@gmail.com>
+Roan Kattouw <roan.kattouw@gmail.com> <roan@wikimedia.org>
+Rob Moen <rmoen@wikimedia.org>
+Sucheta Ghoshal <sghoshal@wikimedia.org>
+Timo Tijhof <krinklemail@gmail.com>
+Trevor Parscal <trevorparscal@gmail.com>
+