diff --git a/.mailmap b/.mailmap
index d6405683..cdacea39 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
-Alejandro Colomar <alx@nginx.com> <a.colomar@f5.com>
-Alejandro Colomar <alx@nginx.com> <alx.manpages@gmail.com>
+Alejandro Colomar <alx@kernel.org> <alx@nginx.com>
+Alejandro Colomar <alx@kernel.org> <a.colomar@f5.com>
+Alejandro Colomar <alx@kernel.org> <alx.manpages@gmail.com>
 Andrew Clayton <a.clayton@nginx.com> <andrew@digital-domain.net>
 Andrew Clayton <a.clayton@nginx.com> <a.clayton@f5.com>