diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..422a11426
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,33 @@
+Tim Su <tim@astrid.com>
+Tim Su <tim@astrid.com> <tim@todoroo.com>
+Tim Su <tim@astrid.com> <Tim@.(none)>
+Tim Su <tim@astrid.com> <astrid@laputa.local>
+Tim Su <tim@astrid.com> <jenkins@astrid.com>
+Tim Su <tim@astrid.com> <timsu@ps17623.dreamhostps.com>
+Tim Su <tim@astrid.com> <timsu@betaful.com>
+
+Joshua Ball <jball@astrid.com>
+Joshua Ball <jball@astrid.com> <JoshBBall@gmail.com>
+
+Jon Paris <jon@astrid.com>
+Jon Paris <jon@astrid.com> <jon@todoroo.com>
+
+Isaac Wang <isaac@astrid.com> <isaacwang@gmail.com>
+
+Andrew Shaw <andrew@astrid.com>
+Andrew Shaw <andrew@astrid.com> <andrew.t.shaw@gmail.com>
+
+<mark@todoroo.com> <mrampton@gmail.com>
+Sam Bosley <sam@astrid.com>
+Sam Bosley <sam@astrid.com> <sboz88@gmail.com>
+
+Scott Chung <schung@astrid.com>
+Scott Chung <schung@astrid.com> <scott@ubuntu.ubuntu-domain>
+
+Jeff Chern <nemo.nihil@gmail.com> <nemo.nihil>
+
+Arne Jans <arne.jans@gmail.com> <jessica.jans@gmail.com>
+
+Abe Parvand <eparvand@gmail.com>
+
+Ian Fraser <ian@bigwave.org.uk> <ian@.(none)>