diff --git a/.mailmap b/.mailmap
index 145e9ea26e4..04daa274ef3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -28,6 +28,7 @@ Anurag Kumar Vulisha <AnuragKumar.Vulisha@amd.com> <anurag.kumar.vulisha@xilinx.
 Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com> <appana.durga.rao@xilinx.com>
 Ashok Reddy Soma <ashok.reddy.soma@amd.com> <ashok.reddy.soma@xilinx.com>
 Atish Patra <atishp@atishpatra.org> <atish.patra@wdc.com>
+Bernhard Messerklinger <bernhard.messerklinger@at.abb.com> <bernhard.messerklinger@br-automation.com>
 Bharat Kumar Gogada <bharat.kumar.gogada@amd.com> <bharat.kumar.gogada@xilinx.com>
 Bharat Kumar Gogada <bharat.kumar.gogada@amd.com> <bharatku@xilinx.com>
 Bhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@amd.com> <bhargava.sreekantappa-gayathri@xilinx.com>
@@ -156,6 +157,7 @@ Wolfgang Denk <wd@denx.de> <wd@pollux.(none)>
 Wolfgang Denk <wd@denx.de> <wd@pollux.denx.de>
 Wolfgang Denk <wd@denx.de> <wd@xpert.denx.de>
 Wolfgang Denk <wd@denx.de> <wdenk>
+Wolfgang Wallner <wolfgang.wallner@at.abb.com> <wolfgang.wallner@br-automation.com>
 York Sun <york.sun@nxp.com>
 York Sun <yorksun@freescale.com>
 Łukasz Majewski <l.majewski@samsung.com>
diff --git a/board/BuR/brppt1/MAINTAINERS b/board/BuR/brppt1/MAINTAINERS
index a974a97c157..b24d7eb9ad5 100644
--- a/board/BuR/brppt1/MAINTAINERS
+++ b/board/BuR/brppt1/MAINTAINERS
@@ -1,5 +1,5 @@
 BRPPT1 BOARD
-M:	Wolfgang Wallner <wolfgang.wallner@br-automation.com>
+M:	Wolfgang Wallner <wolfgang.wallner@at.abb.com>
 S:	Maintained
 F:	board/BuR/brppt1/
 F:	board/BuR/common/
diff --git a/board/BuR/brppt2/MAINTAINERS b/board/BuR/brppt2/MAINTAINERS
index bfeaa571a82..2ab54a909c5 100644
--- a/board/BuR/brppt2/MAINTAINERS
+++ b/board/BuR/brppt2/MAINTAINERS
@@ -1,5 +1,5 @@
 BUR_PPT2 BOARD
-M:	Wolfgang Wallner <wolfgang.wallner@br-automation.com>
+M:	Wolfgang Wallner <wolfgang.wallner@at.abb.com>
 S:	Maintained
 F:	board/BuR/brppt2/
 F:	board/BuR/common/
diff --git a/board/BuR/brsmarc1/MAINTAINERS b/board/BuR/brsmarc1/MAINTAINERS
index 7421f61fc43..f2754582b59 100644
--- a/board/BuR/brsmarc1/MAINTAINERS
+++ b/board/BuR/brsmarc1/MAINTAINERS
@@ -1,5 +1,5 @@
 BRSMARC1 BOARD
-M:	Wolfgang Wallner <wolfgang.wallner@br-automation.com>
+M:	Wolfgang Wallner <wolfgang.wallner@at.abb.com>
 S:	Maintained
 F:	board/BuR/brsmarc1/
 F:	board/BuR/common/
diff --git a/board/BuR/brxre1/MAINTAINERS b/board/BuR/brxre1/MAINTAINERS
index f826a44b6ac..b424ddca6ca 100644
--- a/board/BuR/brxre1/MAINTAINERS
+++ b/board/BuR/brxre1/MAINTAINERS
@@ -1,5 +1,5 @@
 BRXRE1 BOARD
-M:	Wolfgang Wallner <wolfgang.wallner@br-automation.com>
+M:	Wolfgang Wallner <wolfgang.wallner@at.abb.com>
 S:	Maintained
 F:	board/BuR/brxre1/
 F:	board/BuR/common/
diff --git a/board/BuR/zynq/MAINTAINERS b/board/BuR/zynq/MAINTAINERS
index d655cae58d4..e2b04980403 100644
--- a/board/BuR/zynq/MAINTAINERS
+++ b/board/BuR/zynq/MAINTAINERS
@@ -1,5 +1,5 @@
 ZYNQ BOARD
-M:	Wolfgang Wallner <wolfgang.wallner@br-automation.com>
+M:	Wolfgang Wallner <wolfgang.wallner@at.abb.com>
 S:	Maintained
 F:	board/BuR/zynq/
 F:	board/BuR/common/