diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..22d95d3484
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Álvaro Herrera <alvherre@alvh.no-ip.org>