diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..bdb791e7
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Faith Ekstrand <faith@gfxstrand.net> <jason@jlekstrand.net>
+Faith Ekstrand <faith@gfxstrand.net> <jason.ekstrand@intel.com>
+Faith Ekstrand <faith@gfxstrand.net> <jason.ekstrand@collabora.com>