diff --git a/board/gdsys/a38x/MAINTAINERS b/board/gdsys/a38x/MAINTAINERS
index 3cb9b63ff0d59452ea76ad84b5146080bc49af40..d31e675ddce28fb107b0051e5beeb98c278d32e7 100644
--- a/board/gdsys/a38x/MAINTAINERS
+++ b/board/gdsys/a38x/MAINTAINERS
@@ -1,6 +1,6 @@
 A38X BOARD
-M:	Dirk Eibach <eibach@gdsys.cc>
-M:	Mario Six <six@gdsys.de>
+M:	Dirk Eibach <dirk.eibach@gdsys.cc>
+M:	Mario Six <mario.six@gdsys.cc>
 S:	Maintained
 F:	board/gdsys/a38x/
 F:	include/configs/controlcenterdc.h
diff --git a/board/gdsys/common/adv7611.c b/board/gdsys/common/adv7611.c
index b728274cce6d8eed98ecdb0cd0e6080d3fdab127..5355292280dd5fb78cf5a3b914daa901bf400056 100644
--- a/board/gdsys/common/adv7611.c
+++ b/board/gdsys/common/adv7611.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2014
- * Dirk Eibach, Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/board/gdsys/common/fanctrl.c b/board/gdsys/common/fanctrl.c
index 44569bb1aba2e742838e7d5a2cc3ce3077cff2b6..52a4f33836d1baf515d4d3bd0b3eecdb03854730 100644
--- a/board/gdsys/common/fanctrl.c
+++ b/board/gdsys/common/fanctrl.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2015
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/board/gdsys/common/fpga.c b/board/gdsys/common/fpga.c
index e10c105feb136a6dbc034bac830c1c9d9d31e773..09c0446f903032f78087b7054a57da3d1335bfd6 100644
--- a/board/gdsys/common/fpga.c
+++ b/board/gdsys/common/fpga.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2013
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/board/gdsys/common/ihs_mdio.c b/board/gdsys/common/ihs_mdio.c
index 262ead5516449fb38c87dbe14d8669c233c1f2d0..822517d4b284dd2f5e40e290fcfc0b0de72b24f2 100644
--- a/board/gdsys/common/ihs_mdio.c
+++ b/board/gdsys/common/ihs_mdio.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2014
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/board/gdsys/common/ioep-fpga.c b/board/gdsys/common/ioep-fpga.c
index f72a01e5b267ee391c31c2ae92c45054b73feb1b..7ebce04a8a280186294af0b1713fe16fb029e399 100644
--- a/board/gdsys/common/ioep-fpga.c
+++ b/board/gdsys/common/ioep-fpga.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2014
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/board/gdsys/common/miiphybb.c b/board/gdsys/common/miiphybb.c
index 310562902b26ee56699694b983aec4930ed805a3..09b62253cd7997d727b9ce2f1322f8ced9a87e09 100644
--- a/board/gdsys/common/miiphybb.c
+++ b/board/gdsys/common/miiphybb.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2010
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c
index add95743698f7b4c51a93d9a6f1b734b8b257ee7..454468ea3bccaa1467001dcf03856465c9d1c2af 100644
--- a/board/gdsys/common/osd.c
+++ b/board/gdsys/common/osd.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2010
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/board/gdsys/common/osd.h b/board/gdsys/common/osd.h
index 5b3f14bf05eb30899955b5585b769dc17c249a27..a3b0e3d5ae8b8f4ca8de296a6634aa18d0f0f537 100644
--- a/board/gdsys/common/osd.h
+++ b/board/gdsys/common/osd.h
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2010
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/board/gdsys/common/phy.c b/board/gdsys/common/phy.c
index fb926581788fecad42e9c68a68771e8da6963f24..45d2b81f37c17aeec62771f13570a36f89a2f978 100644
--- a/board/gdsys/common/phy.c
+++ b/board/gdsys/common/phy.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2014
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/board/gdsys/mpc8308/MAINTAINERS b/board/gdsys/mpc8308/MAINTAINERS
index 21470bf6b05b4dc4a954989c778189c26e2f33f3..755b9a23858a40bc5d1f25c332dd437ea7fcd04f 100644
--- a/board/gdsys/mpc8308/MAINTAINERS
+++ b/board/gdsys/mpc8308/MAINTAINERS
@@ -1,5 +1,5 @@
 MPC8308 BOARD
-M:	Dirk Eibach <eibach@gdsys.de>
+M:	Dirk Eibach <dirk.eibach@gdsys.cc>
 S:	Maintained
 F:	board/gdsys/mpc8308/
 F:	include/configs/hrcon.h
diff --git a/board/gdsys/mpc8308/Makefile b/board/gdsys/mpc8308/Makefile
index 42702fb967bd18755021ba2cd88d36f85dbdab09..f9671cfbd69740995ae9807ef7cd6755112702e8 100644
--- a/board/gdsys/mpc8308/Makefile
+++ b/board/gdsys/mpc8308/Makefile
@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2014
-# Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+# Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
 #
 # SPDX-License-Identifier:	GPL-2.0+
 #
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index 96f60bef95b128f656f7f09882ebbf28f1d8fb5f..ed5cb332794ebfccb05533e408db6ae0b9065fad 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2014
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/board/gdsys/mpc8308/mpc8308.c b/board/gdsys/mpc8308/mpc8308.c
index 86b257f4de64ea62b99ad1b27d40a9528fb39d1c..928f75a02f0e9399c2a7cce4f4fd12540053f413 100644
--- a/board/gdsys/mpc8308/mpc8308.c
+++ b/board/gdsys/mpc8308/mpc8308.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2014
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
index 88211050610cdfd3c3d37c3a67ad2b5cd6f23148..c8ea8a4ae0a8275d598888976a68eecd2bee30d9 100644
--- a/board/gdsys/mpc8308/strider.c
+++ b/board/gdsys/mpc8308/strider.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2014
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/board/gdsys/p1022/MAINTAINERS b/board/gdsys/p1022/MAINTAINERS
index 5119fbb1426e632224e97a783268c1c8a9f6c797..99f1200c0984ddc022f1de1c1e9fd58bbff856ed 100644
--- a/board/gdsys/p1022/MAINTAINERS
+++ b/board/gdsys/p1022/MAINTAINERS
@@ -1,5 +1,5 @@
 P1022 BOARD
-M:	Dirk Eibach <eibach@gdsys.de>
+M:	Dirk Eibach <dirk.eibach@gdsys.cc>
 S:	Maintained
 F:	board/gdsys/p1022/
 F:	include/configs/controlcenterd.h
diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index 326fd1672d0e18fc764bebd7e34a9b9db2a6631f..c7acf116597336b189e57ba3e7a49cdd98b99922 100644
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2016
- * Mario Six, Guntermann & Drunck GmbH, six@gdsys.de
+ * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc
  *
  * based on arch/powerpc/include/asm/mpc85xx_gpio.h, which is
  *
diff --git a/drivers/gpio/pca9698.c b/drivers/gpio/pca9698.c
index d2663f7331aa5fa78bd25e6d11f4a4cb61a1563c..3995c496aeed67f405e8df5d572e81ce41a60884 100644
--- a/drivers/gpio/pca9698.c
+++ b/drivers/gpio/pca9698.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2011
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index ee96cd50d5bd432ffaa1413459673f3db1322e96..92985212200ea311362922e4c6beaca38cbb226b 100644
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2013
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c
index 4fd772dc4fcb82aac741552204cbca52dffbb1b7..860848777d836b5048e04f936f94c28a517820cf 100644
--- a/drivers/tpm/tpm_atmel_twi.c
+++ b/drivers/tpm/tpm_atmel_twi.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2013 Guntermann & Drunck, GmbH
  *
- * Written by Dirk Eibach <eibach@gdsys.de>
+ * Written by Dirk Eibach <dirk.eibach@gdsys.cc>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 44910859cc66632edb28b289bccde0cbdb4688f2..a8afb15ebae7d8bfb09a715bb7c6c9848d38e3e1 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2014
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  *
  * SPDX-License-Identifier:	GPL-2.0+
diff --git a/include/configs/strider.h b/include/configs/strider.h
index 14b03c813b6423982251121cf64e58e0547aa0e8..9ba52d1303d20bebeb4d62c7b508f77fc629b25f 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2014
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  *
  * SPDX-License-Identifier:	GPL-2.0+
diff --git a/include/gdsys_fpga.h b/include/gdsys_fpga.h
index bb8e144e04900f41bd6dd94c85410763adcf7b39..10290509f502c6ce646dbe121b230bbb6eb94839 100644
--- a/include/gdsys_fpga.h
+++ b/include/gdsys_fpga.h
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2010
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/include/pca9698.h b/include/pca9698.h
index 9732be661d20906b7973a29cb13066fbd91f1214..c7f3ddd50a2a0d020c67b1d05142cbdb6009cfe4 100644
--- a/include/pca9698.h
+++ b/include/pca9698.h
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2011
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */