diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..ee139e80
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,6 @@
+Cal Leeming <cal@iops.io> <cal.leeming@simplicitymedialtd.co.uk>
+Mark LaPerriere <marklap@gmail.com> <mark.a.laperriere@disney.com>
+Selwin Ong <selwin.ong@gmail.com> <selwin@ui.co.id>
+Vincent Driessen <me@nvie.com> <vincent@3rdcloud.com>
+Vincent Driessen <me@nvie.com> <vincent@datafox.nl>
+zhangliyong <lyzhang87@gmail.com> <zhangliyong@umeng.com>