diff --git a/.mailmap b/.mailmap
index 2ff779fc..242d4d91 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,3 +8,4 @@ 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>
diff --git a/AUTHORS b/AUTHORS
index fdfb82fb..e59b92e2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,7 +24,6 @@
 - Alli Witheford <alzeih@gmail.com>
 - Alexandre Petitjean <alpetitjean@gmail.com>
 - Terje Larsen <terlar@gmail.com>
-- Pavol Babincak <scroolik@gmail.com>
-- Javier Domingo <javierdo1@gmail.com>
 - Javier Domingo Cansino <javier.domingo@fon.com>
+- Pavol Babincak <scroolik@gmail.com>
 - Lasse Bigum <lasse@bigum.org>