diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..2da69bc9
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,13 @@
+Nicolas Hennion <nicolashennion@gmail.com> Nicolargo <nicolas@nicolargo.com>
+Nicolas Hennion <nicolashennion@gmail.com> Nicolas Hennion <nicolas@nicolargo.com>
+Nicolas Hennion <nicolashennion@gmail.com> nicolargo <nicolas@nicolargo.com>
+Nicolas Hennion <nicolashennion@gmail.com> nicolargo <nicolashennion@gmail.com>
+Nicolas Hennion <nicolashennion@gmail.com> nicolargo <nicolargo@nicolargo-boulot.(none)>
+Nicolas Hennion <nicolashennion@gmail.com> nicolargo <nicolargo@nicolargo-fujitsu.(none)>
+Nicolas Hennion <nicolashennion@gmail.com> Nicolargo <nicolashennion@gmail.com>
+Nicolas Hennion <nicolashennion@gmail.com> nicolargo <nicolargo@lifebook.(none)>
+Alessio Sergi <al3hex@gmail.com> asergi <al3hex@gmail.com>
+Nicolas Hart <contact@nclshart.net> nclsHart <contact@nclshart.net>
+Nicolas Hart <contact@nclshart.net> Nicolas Hart <n.hart@hexanet.fr>
+Floran Brutel <f.brutel@hexanet.fr> Floran Brutel <contact@floran.fr>
+Brandon Philips <brandon@ifup.org> Brandon Philips <brandon.philips@rackspace.com>