diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..45f2bc6d4
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Kate F <kate@elide.org> Katherine <kate@elide.org>
+Kate F <kate@elide.org> Katherine Flavel <kflavel@fastly.com>
+Devon H. O'Dell <devon.odell@gmail.com> Devon H. O'Dell <dho@fastly.com>