diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..42c881f
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,7 @@
+Christopher White <cxwembedded@gmail.com>
+Christopher White <cxwembedded@gmail.com> <cwhite@d3engineering.com>
+Michael Opdenacker <michael.opdenacker@bootlin.com> <michael@bootlin.com>
+Michael Opdenacker <michael.opdenacker@bootlin.com> <michael@free-electrons.com>
+Michael Opdenacker <michael.opdenacker@bootlin.com> <michael.opdenacker@free-electrons.com>
+Mikaël Bouillot <mikael.bouillot@bootlin.com> <jxaojeib@corbac.com>
+Mikaël Bouillot <mikael.bouillot@bootlin.com> <mikael.bouillot@free-electrons.com>