diff --git a/board/cssi/MAINTAINERS b/board/cssi/MAINTAINERS
index cbf1406a540..7d237b0b209 100644
--- a/board/cssi/MAINTAINERS
+++ b/board/cssi/MAINTAINERS
@@ -1,5 +1,5 @@
-BOARDS from CS Systemes d'Information
-M:	Christophe Leroy <christophe.leroy@c-s.fr>
+BOARDS from CS GROUP France
+M:	Christophe Leroy <christophe.leroy@csgroup.eu>
 S:	Maintained
 F:	board/cssi/
 F:	include/configs/MCR3000.h
diff --git a/doc/git-mailrc b/doc/git-mailrc
index 63c2f6e7daa..b00c2781901 100644
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -95,7 +95,7 @@ alias nios2          nios
 
 alias powerpc        uboot, afleming, stroese, wd, priyankajain, mariosix
 alias ppc            powerpc
-alias mpc8xx         uboot, wd, Christophe Leroy <christophe.leroy@c-s.fr>
+alias mpc8xx         uboot, wd, Christophe Leroy <christophe.leroy@csgroup.eu>
 alias mpc83xx        uboot, mariosix
 alias mpc85xx        uboot, afleming, priyankajain