diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000000..ece5ea1f0a5
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,6 @@
+Mark Story <mark@mark-story.com>
+Mark Story <mark@mark-story.com> <mark@freshbooks.com>
+José Lorenzo Rodríguez <jose.zap@gmail.com>
+José Lorenzo Rodríguez <jose.zap@gmail.com> <lorenzo@users.noreply.github.com>
+José Lorenzo Rodríguez <jose.zap@gmail.com> José Lorenzo Rodríguez Urdaneta <lorenzo@Venus-2.local>
+ADmad <admad.coder@gmail.com> <ADmad@users.noreply.github.com>