diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..c0a8580
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,6 @@
+# Robyn has used different names and e-mail addresses in the course of this project. Map them all to her current name and e-mail.
+Robyn Speer <rspeer@luminoso.com> <rob@luminoso.com>
+Robyn Speer <rspeer@luminoso.com> <rob@lumino.so>
+Robyn Speer <rspeer@luminoso.com> <rspeer@mit.edu>
+Robyn Speer <rspeer@luminoso.com> <rspeer+gh@luminoso.com>
+