diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..e04626c3
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Caleb Hearth <caleb@calebhearth.com> <caleb@calebthompson.io>
+Derek Prior <derekprior@gmail.com> <derek@thoughtbot.com>
+Devon Estes <devon.c.estes@gmail.com> <devoncestes@devons-air.localdomain>