diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..754acfd46
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,5 @@
+Jim <obs.jim@gmail.com>
+Zachary Lund <admin@computerquip.com>
+Benjamin Klettbach <b.klettbach@gmail.com>
+BtbN <btbn@btbn.de>
+John Bradley <jrb@turrettech.com>