diff --git a/board/BuR/common/bur_common.h b/board/BuR/common/bur_common.h
index e4896fb..ded69e7 100644
--- a/board/BuR/common/bur_common.h
+++ b/board/BuR/common/bur_common.h
@@ -3,7 +3,7 @@
  *
  * common board information header for B&R boards
  *
- * Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at>
+ * Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at>
  * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
  *
  * SPDX-License-Identifier:	GPL-2.0+
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index 5b356fb..7830d1a 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -3,7 +3,7 @@
  *
  * common board functions for B&R boards
  *
- * Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at>
+ * Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at>
  * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
  *
  * SPDX-License-Identifier:	GPL-2.0+
diff --git a/board/BuR/kwb/MAINTAINERS b/board/BuR/kwb/MAINTAINERS
index c28fb49..ca7d329 100644
--- a/board/BuR/kwb/MAINTAINERS
+++ b/board/BuR/kwb/MAINTAINERS
@@ -1,5 +1,5 @@
 KWB BOARD
-M:	Hannes Petermaier <hannes.petermaier@br-automation.com>
+M:	Hannes Schmelzer <hannes.schmelzer@br-automation.com>
 S:	Maintained
 F:	board/BuR/kwb/
 F:	include/configs/kwb.h
diff --git a/board/BuR/kwb/Makefile b/board/BuR/kwb/Makefile
index 7b04b26..782664c 100644
--- a/board/BuR/kwb/Makefile
+++ b/board/BuR/kwb/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# Copyright (C) 2014 Hannes Petermaier <oe5hpm@oevsv.at> -
+# Copyright (C) 2014 Hannes Schmelzer <oe5hpm@oevsv.at> -
 # Bernecker & Rainer Industrielektronik GmbH - http://www.br-automation.com/
 #
 # SPDX-License-Identifier:	GPL-2.0+
diff --git a/board/BuR/kwb/board.c b/board/BuR/kwb/board.c
index 01dd1d9..640aca4 100644
--- a/board/BuR/kwb/board.c
+++ b/board/BuR/kwb/board.c
@@ -3,7 +3,7 @@
  *
  * Board functions for B&R KWB Board
  *
- * Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at>
+ * Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at>
  * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
  *
  * SPDX-License-Identifier:	GPL-2.0+
diff --git a/board/BuR/kwb/mux.c b/board/BuR/kwb/mux.c
index 2b1d8d3..40224f7 100644
--- a/board/BuR/kwb/mux.c
+++ b/board/BuR/kwb/mux.c
@@ -3,7 +3,7 @@
  *
  * Pinmux Setting for B&R LEIT Board(s)
  *
- * Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at>
+ * Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at>
  * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
  *
  * SPDX-License-Identifier:	GPL-2.0+
diff --git a/board/BuR/tseries/MAINTAINERS b/board/BuR/tseries/MAINTAINERS
index e57326a..e2e67e6 100644
--- a/board/BuR/tseries/MAINTAINERS
+++ b/board/BuR/tseries/MAINTAINERS
@@ -1,5 +1,5 @@
 TSERIES BOARD
-M:	Hannes Petermaier <hannes.petermaier@br-automation.com>
+M:	Hannes Schmelzer <hannes.schmelzer@br-automation.com>
 S:	Maintained
 F:	board/BuR/tseries/
 F:	include/configs/tseries.h
diff --git a/board/BuR/tseries/Makefile b/board/BuR/tseries/Makefile
index ec0d27a..43945d2 100644
--- a/board/BuR/tseries/Makefile
+++ b/board/BuR/tseries/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at>
+# Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at>
 # Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
 #
 # SPDX-License-Identifier:	GPL-2.0+
diff --git a/board/BuR/tseries/board.c b/board/BuR/tseries/board.c
index d1d698e..bc119e6 100644
--- a/board/BuR/tseries/board.c
+++ b/board/BuR/tseries/board.c
@@ -3,7 +3,7 @@
  *
  * Board functions for B&R LEIT Board
  *
- * Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at>
+ * Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at>
  * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
  *
  * SPDX-License-Identifier:	GPL-2.0+
diff --git a/board/BuR/tseries/mux.c b/board/BuR/tseries/mux.c
index c5dc4b7..349788a 100644
--- a/board/BuR/tseries/mux.c
+++ b/board/BuR/tseries/mux.c
@@ -3,7 +3,7 @@
  *
  * Pinmux Setting for B&R LEIT Board(s)
  *
- * Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at>
+ * Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at>
  * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
  *
  * SPDX-License-Identifier:	GPL-2.0+
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index 0f1e35c..79a5c94 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -33,7 +33,7 @@
  *   (except for OMAP243X and OMAP34XX).
  * - Driver now supports up to I2C5 (OMAP5).
  *
- * Copyright (c) 2014 Hannes Petermaier <oe5hpm@oevsv.at>, B&R
+ * Copyright (c) 2014 Hannes Schmelzer <oe5hpm@oevsv.at>, B&R
  * - Added support for set_speed
  *
  */
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 6f95649..e23d172 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at>
+ * Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at>
  * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
  *
  * minimal framebuffer driver for TI's AM335x SoC to be compatible with
diff --git a/drivers/video/am335x-fb.h b/drivers/video/am335x-fb.h
index 7f799d1..3f4b567 100644
--- a/drivers/video/am335x-fb.h
+++ b/drivers/video/am335x-fb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at> -
+ * Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at> -
  * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
  *
  * SPDX-License-Identifier:	GPL-2.0+
diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index b441fa0..639e5a0 100644
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -3,7 +3,7 @@
  *
  * common parts used by B&R AM335x based boards
  *
- * Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at> -
+ * Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at> -
  * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
  *
  * SPDX-License-Identifier:        GPL-2.0+
diff --git a/include/configs/kwb.h b/include/configs/kwb.h
index d1c745e..acff5b9 100644
--- a/include/configs/kwb.h
+++ b/include/configs/kwb.h
@@ -3,7 +3,7 @@
  *
  * specific parts for B&R KWB Motherboard
  *
- * Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at> -
+ * Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at> -
  * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
  *
  * SPDX-License-Identifier:        GPL-2.0+
diff --git a/include/configs/tseries.h b/include/configs/tseries.h
index 9218533..f3f71f1 100644
--- a/include/configs/tseries.h
+++ b/include/configs/tseries.h
@@ -3,7 +3,7 @@
  *
  * specific parts for B&R T-Series Motherboard
  *
- * Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at> -
+ * Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at> -
  * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
  *
  * SPDX-License-Identifier:        GPL-2.0+