diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..d0a8fb95a
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Miguel Ángel Arruga Vivas <rosen644835@gmail.com> Miguel Angel Arruga Vivas <rosen644835@gmail.com>
+Daiki Ueno <ueno@gnu.org> Daiki Ueno <ueno@unixuser.org>
+Guido Flohr <guido@imperia.net> Guido Flohr <guido@imperia.bg>