diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..be9b8e2
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,5 @@
+Zhiyi Zhang <zhiyi@cs.ucla.edu> <zhiyi.zhang@ucla.edu>
+<davidepesa@gmail.com> <davide.pesavento@lip6.fr>
+Alexander Afanasyev <aa@cs.fiu.edu> <aa@cs.ucla.edu>
+Alexander Afanasyev <aa@cs.fiu.edu> <alexander.afanasyev@ucla.edu>
+Md Ashiqur Rahman <marahman@email.arizona.edu>