diff --git a/MAINTAINERS b/MAINTAINERS
index a9a1049eafc599ccab12f93b6763033cfbf27db8..c53656695a6b2fc95d4b9999231b3bf8d98a2982 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -366,7 +366,7 @@ F:	arch/arm/include/asm/arch-stv0991/
 
 ARM SUNXI
 M:	Jagan Teki <jagan@amarulasolutions.com>
-M:	Maxime Ripard <maxime.ripard@bootlin.com>
+M:	Maxime Ripard <mripard@kernel.org>
 S:	Maintained
 T:	git https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi.git
 F:	arch/arm/cpu/armv7/sunxi/
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index c7e9d3eda0843a2b7a85551f468ddb9d1d6ec126..88f13533b8852c6355660d2d56b39f0995fb9958 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -151,7 +151,7 @@ F:	configs/Bananapi_M2_Ultra_defconfig
 F:	arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts
 
 BANANAPI M2 MAGIC BOARD
-M:	Maxime Ripard <maxime.ripard@bootlin.com>
+M:	Maxime Ripard <mripard@kernel.org>
 S:	Maintained
 F:	configs/Bananapi_m2m_defconfig
 F:	arch/arm/dts/sun8i-r16-bananapi-m2m.dts
@@ -179,7 +179,7 @@ F:	configs/beelink_x2_defconfig
 F:	arch/arm/dts/sun8i-h3-beelink-x2.dts
 
 COLOMBUS BOARD
-M:	Maxime Ripard <maxime.ripard@bootlin.com>
+M:	Maxime Ripard <mripard@kernel.org>
 S:	Maintained
 F:	configs/Colombus_defconfig
 
@@ -465,7 +465,7 @@ F:	configs/Sunchip_CX-A99_defconfig
 W:	https://linux-sunxi.org/Sunchip_CX-A99
 
 TBS A711 BOARD
-M:	Maxime Ripard <maxime.ripard@bootlin.com>
+M:	Maxime Ripard <mripard@kernel.org>
 S:	Maintained
 F:	configs/tbs_a711_defconfig