diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..eadd15e3f3
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Ray Smith <rays@google.com> <theraysmith@gmail.com> <theraysmith@gmail.com@d0cd1f9f-072b-0410-8dd7-cf729c803f20>
+zdenop <zdenop@gmail.com> <zdenop@gmail.com@d0cd1f9f-072b-0410-8dd7-cf729c803f20>
+jimregan <joregan@gmail.com> <joregan@gmail.com@d0cd1f9f-072b-0410-8dd7-cf729c803f20>