diff --git a/.mailmap b/.mailmap
index 022d8caf08c9e..6a34831b7e231 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,7 @@
+JuliaLang
+JuliaLang
+
+Jeff Bezanson
Jeff Bezanson
Jeff Bezanson
Jeff Bezanson
@@ -6,23 +10,23 @@ Jeff Bezanson
Jeff Bezanson
Jeff Bezanson
Jeff Bezanson
-Jeff Bezanson
Jeff Bezanson
Jeff Bezanson
Jeff Bezanson
+Stefan Karpinski
Stefan Karpinski
Stefan Karpinski
-Stefan Karpinski
+Viral B. Shah
Viral B. Shah
Viral B. Shah
-Viral B. Shah
George Xing
+George Xing
-Stephan Boyer
Stephan Boyer
+Stephan Boyer
Stephan Boyer
Stephan Boyer
@@ -31,3 +35,5 @@ Giuseppe Zingales
Jameson Nash
Jameson Nash
+
+Alan Edelman