diff --git a/.mailmap b/.mailmap
index 260770b8..e19cc5cc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,5 +8,5 @@ John Bäckstrand <sopues@gmail.com> <sandos@XBMCLive.(none)>
 Alli Witheford <alzeih@gmail.com>
 Alexandre Petitjean <alpetitjean@gmail.com>
 Alexandre Petitjean <alpetitjean@gmail.com> <alexandre.petitjean@lne.fr>
-Javier Domingo Cansino <javier.domingo@fon.com> <javierdo1@gmail.com>
+Javier Domingo Cansino <javierdo1@gmail.com> <javier.domingo@fon.com>
 Lasse Bigum <lasse@bigum.org> <l.bigum@samsung.com>
diff --git a/AUTHORS b/AUTHORS
index e59b92e2..3794a267 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,6 +24,7 @@
 - Alli Witheford <alzeih@gmail.com>
 - Alexandre Petitjean <alpetitjean@gmail.com>
 - Terje Larsen <terlar@gmail.com>
-- Javier Domingo Cansino <javier.domingo@fon.com>
+- Javier Domingo Cansino <javierdo1@gmail.com>
 - Pavol Babincak <scroolik@gmail.com>
+- Javier Domingo <javierdo1@gmail.com>
 - Lasse Bigum <lasse@bigum.org>