diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..582dae0b9
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Vicent Martí <vicent@github.com> Vicent Marti <tanoku@gmail.com> 
+Vicent Martí <vicent@github.com> Vicent Martí <tanoku@gmail.com>
+Michael Schubert <schu@schu.io> schu <schu-github@schulog.org>