diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..4bc5010a3
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,12 @@
+Anastasia Karpinska <akarpinska@griddynamics.com>
+Angus Salkeld <asalkeld@redhat.com>
+Changbin Liu <changbl@research.att.com>
+Changbin Liu <changbl@research.att.com> <changbin.liu@gmail.com>
+Ivan A. Melnikov <imelnikov@griddynamics.com>
+Jessica Lucci <jessica.lucci@rackspace.com>
+Jessica Lucci <jessica.lucci@rackspace.com> <jessicalucci14@gmail.com>
+Joshua Harlow <harlowja@yahoo-inc.com>
+Joshua Harlow <harlowja@yahoo-inc.com> <harlowja@gmail.com>
+Kevin Chen <kevin.chen@rackspace.com>
+Kevin Chen <kevin.chen@rackspace.com> <kevi6362@mj4efudty3.rackspace.corp>
+Kevin Chen <kevin.chen@rackspace.com> <kevin.chen.weijie@utexas.edu>