diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..4ce235a
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Pierre Vigier <pierre.vigier@transfer-to.com> Pierre VIGIER <pierre.vigier@gmail.com>
+Yanick Champoux <yanick@cpan.org> Yanick Champoux <yanick@babyl.dyndns.org>