diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..71b9538464
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,21 @@
+Anders Kaseorg <anders@zulip.com> <anders@zulipchat.com>
+Anders Kaseorg <anders@zulip.com> <andersk@mit.edu>
+Chris Bobbe <cbobbe@zulip.com> <cbobbe@zulipchat.com>
+Chris Bobbe <cbobbe@zulip.com> <csbobbe@gmail.com>
+Greg Price <greg@zulip.com> <gnprice@gmail.com>
+Greg Price <greg@zulip.com> <greg@zulipchat.com>
+Greg Price <greg@zulip.com> <price@mit.edu>
+Ray Kraesig <rkraesig@zulip.com> <rkraesig@zulipchat.com>
+Rishi Gupta <rishig@zulip.com> <rishig+git@mit.edu>
+Rishi Gupta <rishig@zulip.com> <rishig@kandralabs.com>
+Rishi Gupta <rishig@zulip.com> <rishig@users.noreply.github.com>
+Rishi Gupta <rishig@zulip.com> <rishig@zulipchat.com>
+Steve Howell <showell@zulip.com> <showell30@yahoo.com>
+Steve Howell <showell@zulip.com> <showell@yahoo.com>
+Steve Howell <showell@zulip.com> <showell@zulipchat.com>
+Steve Howell <showell@zulip.com> <steve@humbughq.com>
+Steve Howell <showell@zulip.com> <steve@zulip.com>
+Tim Abbott <tabbott@zulip.com> <tabbott@dropbox.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>