diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..2d71e10
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,27 @@
+Benjamin Ragan-Kelley <benjaminrk@gmail.com> <minrk@Mercury.local>
+Benjamin Ragan-Kelley <benjaminrk@gmail.com> Min RK
+Benjamin Ragan-Kelley <benjaminrk@gmail.com> MinRK <benjaminrk@gmail.com>
+Brian E. Granger <ellisonbg@gmail.com> Brian Granger
+Brian E. Granger <ellisonbg@gmail.com> Brian Granger <>
+Brian E. Granger <ellisonbg@gmail.com> bgranger <>
+Brian E. Granger <ellisonbg@gmail.com> bgranger <bgranger@red>
+Evan Patterson <epatters@enthought.com> <epatters@EPattersons-MacBook-Pro.local>
+Evan Patterson <epatters@enthought.com> <epatters@caltech.edu>
+Evan Patterson <epatters@enthought.com> epatters <epatters@enthought.com>
+Fernando Perez <Fernando.Perez@berkeley.edu> fperez <>
+Fernando Perez <Fernando.Perez@berkeley.edu> fptest <>
+Fernando Perez <Fernando.Perez@berkeley.edu> fptest1 <>
+Gael Varoquaux <gael.varoquaux@normalesup.org> gael.varoquaux <>
+Gael Varoquaux <gael.varoquaux@normalesup.org> gvaroquaux <gvaroquaux@gvaroquaux-desktop>
+Laurent Dufréchou <laurent.dufrechou@gmail.com> <laurent.dufrechou@gmail.com>
+Laurent Dufréchou <laurent.dufrechou@gmail.com> Laurent Dufréchou <laurent@Pep>
+Laurent Dufréchou <laurent.dufrechou@gmail.com> laurent dufrechou <>
+Laurent Dufréchou <laurent.dufrechou@gmail.com> laurent.dufrechou <>
+Laurent Dufréchou <laurent.dufrechou@gmail.com> laurent.dufrechou@gmail.com <>
+Laurent Dufréchou <laurent.dufrechou@gmail.com> ldufrechou <ldufrechou@PEP>
+Robert Kern <robert.kern@gmail.com> rkern <>
+Ville M. Vainio <vivainio@gmail.com> <vivainio2@WN-W0941>
+Ville M. Vainio <vivainio@gmail.com> vivainio <>
+Ville M. Vainio <vivainio@gmail.com> ville <ville@ville-desktop>
+Ville M. Vainio <vivainio@gmail.com> ville <ville@VILLE-PC>
+Walter Doerwald <walter@livinglogic.de> walter.doerwald <>