diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..52269d5
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+<aa@cs.fiu.edu> <alexander.afanasyev@ucla.edu>
+<davidepesa@gmail.com> <davide.pesavento@lip6.fr>