diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..55a41c7
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+Florian Briand <florian.briand@digital-engine.info> <florian.briand@digital-engine.info>
+theo <theo.lettermann@gmail.com> <t.lettermann@criteo.com>
+kosssi <simon@p4pillon.org> <simonc@linux.com>
+lienjukaisim <julien.misiak@live.com> <154924955+lienjukaisim@users.noreply.github.com>