diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..e130cc4bb
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,6 @@
+Kris Borchers <kris.borchers@gmail.com>
+Kris Borchers <kris.borchers@gmail.com> <k_borchers@yahoo.com>
+Corey Frang <gnarf@gnarf.net>
+Maggie Costello Wachs <fg.maggie@gmail.com> maggiewachs <maggie@filamentgroup.com>
+Richard Worth <rdworth@gmail.com>
+Jörn Zaefferer <joern.zaefferer@gmail.com>