diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..bbdc4ff
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,9 @@
+Anders Kaseorg <anders@zulip.com> <anders@zulipchat.com>
+Anders Kaseorg <anders@zulip.com> <andersk@mit.edu>
+Rishi Gupta <rishig@zulip.com> <rishig@zulipchat.com>
+Steve Howell <showell@zulip.com> <showell30@yahoo.com>
+Steve Howell <showell@zulip.com> <showell@zulipchat.com>
+Steve Howell <showell@zulip.com> <steve@zulip.com>
+Tim Abbott <tabbott@zulip.com> <tabbott@humbughq.com>
+Tim Abbott <tabbott@zulip.com> <tabbott@mit.edu>
+Tim Abbott <tabbott@zulip.com> <tabbott@zulipchat.com>