diff --git a/.mailmap b/.mailmap
index c7bb0efde84d25154db917f4bc084f3b0a457445..02dccfc1aee7ff5fd29007bf9daad769da5ea5e4 100644
--- a/.mailmap
+++ b/.mailmap
@@ -12,7 +12,7 @@ Allen Martin <amartin@nvidia.com>
 Andreas Bießmann <andreas.devel@googlemail.com>
 Aneesh V <aneesh@ti.com>
 Dirk Behme <dirk.behme@googlemail.com>
-Fabio Estevam <fabio.estevam@freescale.com>
+Fabio Estevam <fabio.estevam@nxp.com>
 Jagan Teki <402jagan@gmail.com>
 Jagan Teki <jaganna@gmail.com>
 Jagan Teki <jaganna@xilinx.com>
diff --git a/board/freescale/mx25pdk/MAINTAINERS b/board/freescale/mx25pdk/MAINTAINERS
index 63221765c7b51c3b8ca1206f6b55e20cbf20afe8..fa4651e2dfbcd5d90880c82ea2a6979b080496f9 100644
--- a/board/freescale/mx25pdk/MAINTAINERS
+++ b/board/freescale/mx25pdk/MAINTAINERS
@@ -1,5 +1,5 @@
 MX25PDK BOARD
-M:	Fabio Estevam <fabio.estevam@freescale.com>
+M:	Fabio Estevam <fabio.estevam@nxp.com>
 S:	Maintained
 F:	board/freescale/mx25pdk/
 F:	include/configs/mx25pdk.h
diff --git a/board/freescale/mx28evk/MAINTAINERS b/board/freescale/mx28evk/MAINTAINERS
index 1caf5fb22abb3f762389436285d3b33a6d73d71b..a98a70558a7265b09fbe482e45210955ca9797eb 100644
--- a/board/freescale/mx28evk/MAINTAINERS
+++ b/board/freescale/mx28evk/MAINTAINERS
@@ -1,5 +1,5 @@
 MX28EVK BOARD
-M:	Fabio Estevam <fabio.estevam@freescale.com>
+M:	Fabio Estevam <fabio.estevam@nxp.com>
 S:	Maintained
 F:	board/freescale/mx28evk/
 F:	include/configs/mx28evk.h
diff --git a/board/freescale/mx53ard/MAINTAINERS b/board/freescale/mx53ard/MAINTAINERS
index 7cc0e5e22204c9f11b3072e934f584ac72c93d53..fa81afe9a330ced978aefab02720d3bee9d48aa6 100644
--- a/board/freescale/mx53ard/MAINTAINERS
+++ b/board/freescale/mx53ard/MAINTAINERS
@@ -1,5 +1,5 @@
 MX53ARD BOARD
-M:	Fabio Estevam <fabio.estevam@freescale.com>
+M:	Fabio Estevam <fabio.estevam@nxp.com>
 S:	Maintained
 F:	board/freescale/mx53ard/
 F:	include/configs/mx53ard.h
diff --git a/board/freescale/mx53smd/MAINTAINERS b/board/freescale/mx53smd/MAINTAINERS
index 88303214951dd6b089d976842fe9013dc26368e8..17ec376f2a923405b41d28f57c02f01e77909ed5 100644
--- a/board/freescale/mx53smd/MAINTAINERS
+++ b/board/freescale/mx53smd/MAINTAINERS
@@ -1,5 +1,5 @@
 MX53SMD BOARD
-M:	Fabio Estevam <fabio.estevam@freescale.com>
+M:	Fabio Estevam <fabio.estevam@nxp.com>
 S:	Maintained
 F:	board/freescale/mx53smd/
 F:	include/configs/mx53smd.h
diff --git a/board/freescale/mx6qsabreauto/MAINTAINERS b/board/freescale/mx6qsabreauto/MAINTAINERS
index 75a8862ef69647220c6c8e019c9ea497bf117dda..687f68c2f9c1186c86c95348a724c861de9f2ad0 100644
--- a/board/freescale/mx6qsabreauto/MAINTAINERS
+++ b/board/freescale/mx6qsabreauto/MAINTAINERS
@@ -1,5 +1,5 @@
 MX6QSABREAUTO BOARD
-M:	Fabio Estevam <fabio.estevam@freescale.com>
+M:	Fabio Estevam <fabio.estevam@nxp.com>
 M:	Peng Fan <Peng.Fan@freescale.com>
 S:	Maintained
 F:	board/freescale/mx6qsabreauto/
diff --git a/board/freescale/mx6sabresd/MAINTAINERS b/board/freescale/mx6sabresd/MAINTAINERS
index 0011ec7b493180f46c96f516bbe288e734972990..add23143a31127794b5ccbfe65e3987afd2c7988 100644
--- a/board/freescale/mx6sabresd/MAINTAINERS
+++ b/board/freescale/mx6sabresd/MAINTAINERS
@@ -1,5 +1,5 @@
 MX6SABRESD BOARD
-M:	Fabio Estevam <fabio.estevam@freescale.com>
+M:	Fabio Estevam <fabio.estevam@nxp.com>
 S:	Maintained
 F:	board/freescale/mx6sabresd/
 F:	include/configs/mx6sabresd.h
diff --git a/board/freescale/mx6slevk/MAINTAINERS b/board/freescale/mx6slevk/MAINTAINERS
index f4e74ba725c04ceb8e7c68c1b0c8f16ac971cbd1..2e254338286a551a718c2b20edfad34f3676fa1e 100644
--- a/board/freescale/mx6slevk/MAINTAINERS
+++ b/board/freescale/mx6slevk/MAINTAINERS
@@ -1,5 +1,5 @@
 MX6SLEVK BOARD
-M:	Fabio Estevam <fabio.estevam@freescale.com>
+M:	Fabio Estevam <fabio.estevam@nxp.com>
 M:	Peng Fan <Peng.Fan@freescale.com>
 S:	Maintained
 F:	board/freescale/mx6slevk/
diff --git a/board/freescale/mx6sxsabresd/MAINTAINERS b/board/freescale/mx6sxsabresd/MAINTAINERS
index c0f5d9c8e4b17162d0a4ce4d652dcdb74e009ba5..1dcec6754599517cc49a57f05cabb73dde4a0725 100644
--- a/board/freescale/mx6sxsabresd/MAINTAINERS
+++ b/board/freescale/mx6sxsabresd/MAINTAINERS
@@ -1,5 +1,5 @@
 MX6SXSABRESD BOARD
-M:	Fabio Estevam <fabio.estevam@freescale.com>
+M:	Fabio Estevam <fabio.estevam@nxp.com>
 S:	Maintained
 F:	board/freescale/mx6sxsabresd/
 F:	include/configs/mx6sxsabresd.h
diff --git a/board/solidrun/mx6cuboxi/MAINTAINERS b/board/solidrun/mx6cuboxi/MAINTAINERS
index a3506c2f8ffd45b8309674d9a55034262dbe704c..81f82bc9b5ea36be73d3a87f53f288caadd5d529 100644
--- a/board/solidrun/mx6cuboxi/MAINTAINERS
+++ b/board/solidrun/mx6cuboxi/MAINTAINERS
@@ -1,5 +1,5 @@
 MX6CUBOXI BOARD
-M:	Fabio Estevam <fabio.estevam@freescale.com>
+M:	Fabio Estevam <fabio.estevam@nxp.com>
 S:	Maintained
 F:	board/solidrun/mx6cuboxi/
 F:	include/configs/mx6cuboxi.h
diff --git a/board/udoo/MAINTAINERS b/board/udoo/MAINTAINERS
index 789e98ff85d314f22e41bff1785f25b46b02df7b..b05243c429d39676cd6293a6dd9383ffb4522f5e 100644
--- a/board/udoo/MAINTAINERS
+++ b/board/udoo/MAINTAINERS
@@ -1,5 +1,5 @@
 UDOO BOARD
-M:	Fabio Estevam <fabio.estevam@freescale.com>
+M:	Fabio Estevam <fabio.estevam@nxp.com>
 S:	Maintained
 F:	board/udoo/
 F:	include/configs/udoo.h
diff --git a/board/wandboard/MAINTAINERS b/board/wandboard/MAINTAINERS
index 0680517c36fbe38221a26badd0bd3f9c7af41d7a..d7cbae8f9502dd713f13b9aa8304221a0c5a0ace 100644
--- a/board/wandboard/MAINTAINERS
+++ b/board/wandboard/MAINTAINERS
@@ -1,5 +1,5 @@
 WANDBOARD BOARD
-M:	Fabio Estevam <fabio.estevam@freescale.com>
+M:	Fabio Estevam <fabio.estevam@nxp.com>
 S:	Maintained
 F:	board/wandboard/
 F:	include/configs/wandboard.h