diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..7cdbd59
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,14 @@
+<aa@cs.fiu.edu> <alexander.afanasyev@ucla.edu>
+<davidepesa@gmail.com> <davide.pesavento@lip6.fr>
+<enewberry@email.arizona.edu> <enewberry@cs.arizona.edu>
+Vince Lehman <vslehman@memphis.edu> <vlehman1@gmail.com>
+<lybmath2009@gmail.com> <lybmath@ucla.edu>
+Hila Ben Abraham <hilata@gmail.com>
+<tuyukai1994@gmail.com> <tyk@bupt.edu.cn>
+Haowei Yuan <hyuan@wustl.edu>
+Minsheng Zhang <jimmyzms5@gmail.com>
+Spyridon Mastorakis <spiros.mastorakis@gmail.com>
+Md Ashiqur Rahman <marahman@email.arizona.edu>
+Yumin Xia <me@yumin-xia.com>
+<chghasemi@cs.arizona.edu> <chavoosh.ghasemi@gmail.com>
+Tai-Lin Chu <tailinchu@gmail.com>