diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..c579c5e4b2
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Eli Barzilay        <eli@racket-lang.org>   <eli@barzilay.org>
+Kevin Tew           <tewk@racket-lang.org>  <tewk@tan.tewk.com>
+Sam Tobin-Hochstadt <samth@racket-lang.org> <samth@punge.ccs.neu.edu>