diff --git a/MAINTAINERS b/MAINTAINERS
index f5c73db3438..9f0c9f9f735 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -118,7 +118,7 @@ F:	cmd/arm/
 ARM ALTERA SOCFPGA
 M:	Marek Vasut <marex@denx.de>
 M:	Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
-M:	Ley Foon Tan <ley.foon.tan@intel.com>
+M:	Ley Foon Tan <lftan.linux@gmail.com>
 S:	Maintainted
 T:	git https://source.denx.de/u-boot/custodians/u-boot-socfpga.git
 F:	arch/arm/mach-socfpga/
diff --git a/doc/git-mailrc b/doc/git-mailrc
index f520ff89b39..34f936f4d83 100644
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -29,7 +29,7 @@ alias jaehoon        Jaehoon Chung <jh80.chung@samsung.com>
 alias jagan          Jagan Teki <jagan@amarulasolutions.com>
 alias jhersh         Joe Hershberger <joe.hershberger@ni.com>
 alias kevery         Kever Yang <kever.yang@rock-chips.com>
-alias leyfoon        Ley Foon Tan <ley.foon.tan@intel.com>
+alias leyfoon        Ley Foon Tan <lftan.linux@gmail.com>
 alias lokeshvutla    Lokesh Vutla <lokeshvutla@ti.com>
 alias lukma          Lukasz Majewski <lukma@denx.de>
 alias macpaul        Macpaul Lin <macpaul@andestech.com>