diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..a0686d3
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+<enewberry@email.arizona.edu> <enewberry@cs.arizona.edu>
+<git@mail1.yoursunny.com> <sjx@a.integ.ndn-routing.emulab.net>
+<davidepesa@gmail.com> <davide.pesavento@lip6.fr>
+<lybmath2009@gmail.com> <lybmath@ucla.edu>