diff --git a/cpu/kinetis_common/gpio.c b/cpu/kinetis_common/gpio.c
index 4efc4ef6f5..6407fd6c64 100644
--- a/cpu/kinetis_common/gpio.c
+++ b/cpu/kinetis_common/gpio.c
@@ -16,7 +16,7 @@
  * @file
  * @brief       Low-level GPIO driver implementation
  *
- * @author      Hauke Petersen <mail@haukepetersen.de>
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  * @author      Johann Fischer <j.fischer@phytec.de>
  * @author      Jonas Remmert <j.remmert@phytec.de>
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
diff --git a/cpu/kinetis_common/random_rnga.c b/cpu/kinetis_common/random_rnga.c
index 3dcb8d48cf..8e9237411f 100644
--- a/cpu/kinetis_common/random_rnga.c
+++ b/cpu/kinetis_common/random_rnga.c
@@ -16,7 +16,7 @@
  * @brief       Low-level random number generator driver implementation.
  *
  * @author      Johann Fischer <j.fischer@phytec.de> (adaption for Freescale's RNGA)
- * @author      Hauke Petersen <mail@haukepetersen.de>
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  *
  * @}
  */
diff --git a/cpu/kinetis_common/random_rngb.c b/cpu/kinetis_common/random_rngb.c
index f6e23586de..19218680be 100644
--- a/cpu/kinetis_common/random_rngb.c
+++ b/cpu/kinetis_common/random_rngb.c
@@ -17,7 +17,7 @@
  *
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se> (adaption for Freescale's RNGB)
  * @author      Johann Fischer <j.fischer@phytec.de> (adaption for Freescale's RNGA)
- * @author      Hauke Petersen <mail@haukepetersen.de>
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  *
  * @}
  */
diff --git a/cpu/sam3/periph/gpio.c b/cpu/sam3/periph/gpio.c
index ef5dab67e8..1bc9cfa4c2 100644
--- a/cpu/sam3/periph/gpio.c
+++ b/cpu/sam3/periph/gpio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Hauke Petersen <mail@haukepetersen.de>
+ * Copyright (C) 2014 Hauke Petersen <devel@haukepetersen.de>
  *               2015 Hamburg University of Applied Sciences
  *               2015 Freie Universität Berlin
  *
diff --git a/cpu/stm32f0/periph/gpio.c b/cpu/stm32f0/periph/gpio.c
index 1c690d9752..1dbaf9113c 100644
--- a/cpu/stm32f0/periph/gpio.c
+++ b/cpu/stm32f0/periph/gpio.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       Low-level GPIO driver implementation
  *
- * @author      Hauke Petersen <mail@haukepetersen.de>
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  *
  * @}
  */
diff --git a/cpu/stm32f0/periph/spi.c b/cpu/stm32f0/periph/spi.c
index 9011c64bc7..6a337c97d2 100644
--- a/cpu/stm32f0/periph/spi.c
+++ b/cpu/stm32f0/periph/spi.c
@@ -14,7 +14,7 @@
  * @brief       Low-level GPIO driver implementation
  *
  * @author      Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
- * @author      Hauke Petersen <mail@haukepetersen.de>
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
diff --git a/cpu/stm32f1/periph/gpio.c b/cpu/stm32f1/periph/gpio.c
index 7331d6fc8f..e49d477d44 100644
--- a/cpu/stm32f1/periph/gpio.c
+++ b/cpu/stm32f1/periph/gpio.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       Low-level GPIO driver implementation
  *
- * @author      Hauke Petersen <mail@haukepetersen.de>
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  *
  * @}
diff --git a/cpu/stm32f3/periph/pwm.c b/cpu/stm32f3/periph/pwm.c
index db0733965e..2b4a165c08 100644
--- a/cpu/stm32f3/periph/pwm.c
+++ b/cpu/stm32f3/periph/pwm.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       Low-level PWM driver implementation
  *
- * @author      Hauke Petersen <mail@haukepetersen.de>
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  *
  * @}
  */
diff --git a/cpu/stm32f4/periph/gpio.c b/cpu/stm32f4/periph/gpio.c
index 7f84eb71d3..8ad84ad6c3 100644
--- a/cpu/stm32f4/periph/gpio.c
+++ b/cpu/stm32f4/periph/gpio.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       Low-level GPIO driver implementation
  *
- * @author      Hauke Petersen <mail@haukepetersen.de>
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  *
  * @}
diff --git a/cpu/stm32f4/periph/pwm.c b/cpu/stm32f4/periph/pwm.c
index f317efb929..f905a1c61e 100644
--- a/cpu/stm32f4/periph/pwm.c
+++ b/cpu/stm32f4/periph/pwm.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       Low-level PWM driver implementation
  *
- * @author      Hauke Petersen <mail@haukepetersen.de>
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  *
  * @}
diff --git a/cpu/stm32f4/periph/random.c b/cpu/stm32f4/periph/random.c
index 6aadbb23d4..61d819b0c8 100644
--- a/cpu/stm32f4/periph/random.c
+++ b/cpu/stm32f4/periph/random.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       Low-level random number generator driver implementation
  *
- * @author      Hauke Petersen <mail@haukepetersen.de>
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  *
  * @}
  */
diff --git a/cpu/stm32l1/periph/spi.c b/cpu/stm32l1/periph/spi.c
index 17c23d230d..ca595690e8 100644
--- a/cpu/stm32l1/periph/spi.c
+++ b/cpu/stm32l1/periph/spi.c
@@ -14,7 +14,7 @@
  * @brief       Low-level SPI driver implementation
  *
  * @author      Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
- * @author      Hauke Petersen <mail@haukepetersen.de>
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>