diff --git a/boards/msba2-common/board_common_init.c b/boards/msba2-common/board_common_init.c
index c336f9a96aea2974a047dc5e815f7e52da31c66d..8e4723ac922af66829a8b26e26b045390fc11690 100644
--- a/boards/msba2-common/board_common_init.c
+++ b/boards/msba2-common/board_common_init.c
@@ -16,7 +16,7 @@
  * @brief       MSB-A2 board initialization
  *
  * @author      Heiko Will
- * @author      Kaspar Schleiser
+ * @author      Kaspar Schleiser <kaspar@schleiser.de>
  * @author      Michael Baar <baar@inf.fu-berlin.de>
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  * @note        $Id$
diff --git a/boards/msba2-common/tools/src/pseudoterm.c b/boards/msba2-common/tools/src/pseudoterm.c
index ff26a89defacaf1fa1d799471d745e5f1e657fdc..9dc4364159bdf2728215d6d5edb90f58afe15cc5 100644
--- a/boards/msba2-common/tools/src/pseudoterm.c
+++ b/boards/msba2-common/tools/src/pseudoterm.c
@@ -1,6 +1,6 @@
 /*
 
-    Author: Kaspar Schleiser
+    Author: Kaspar Schleiser <kaspar@schleiser.de>
 
 This is free and unencumbered software released into the public domain.
 
diff --git a/boards/msba2/board_init.c b/boards/msba2/board_init.c
index 7d5d12eb30c9bb02def65604e20241af2355556c..00dbc1d72a4727fdb06587e4dd106a34be83a9c0 100644
--- a/boards/msba2/board_init.c
+++ b/boards/msba2/board_init.c
@@ -17,7 +17,7 @@
  * @brief       MSB-A2 board initialization
  *
  * @author      Heiko Will
- * @author      Kaspar Schleiser
+ * @author      Kaspar Schleiser <kaspar@schleiser.de>
  * @author      Michael Baar <baar@inf.fu-berlin.de>
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  *
diff --git a/cpu/arm7_common/arm_cpu.c b/cpu/arm7_common/arm_cpu.c
index f6957bdcf1541b992a3571de9fd9bbb3305aa625..1041e7c62e20c2a104687db52066201fe7049c1d 100644
--- a/cpu/arm7_common/arm_cpu.c
+++ b/cpu/arm7_common/arm_cpu.c
@@ -2,7 +2,7 @@
  * ARM architecture common support functions
  *
  * Copyright (C) 2008, 2009  Heiko Will <hwill@inf.fu-berlin.de>
- * Copyright (C) 2009  Kaspar Schleiser <kaspar@schleiser.de>
+ * Copyright (C) 2009 Kaspar Schleiser <kaspar@schleiser.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
diff --git a/cpu/cc2538/periph/pm.c b/cpu/cc2538/periph/pm.c
index 19c0d5fa4ed6089b52a97d32f25d731ad0f3155f..1d5f07fd9d29979a677d03f31d68cd4b3d8f90a6 100644
--- a/cpu/cc2538/periph/pm.c
+++ b/cpu/cc2538/periph/pm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Kaspar Schleiser <kaspar@schleiser.de
+ * Copyright (C) 2017 Kaspar Schleiser <kaspar@schleiser.de>
  *               2017 Freie Universität Berlin
  *
  * This file is subject to the terms and conditions of the GNU Lesser
diff --git a/cpu/cortexm_common/ldscripts/multislot.ld b/cpu/cortexm_common/ldscripts/multislot.ld
index d78b70224da304d7fcd9beed7ff60d1448e86347..22d89a795895b1586f5cb523699d259cead3645b 100644
--- a/cpu/cortexm_common/ldscripts/multislot.ld
+++ b/cpu/cortexm_common/ldscripts/multislot.ld
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Kaspar Schleiser
+ * Copyright (C) 2017 Kaspar Schleiser <kaspar@schleiser.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
diff --git a/cpu/cortexm_common/periph/pm.c b/cpu/cortexm_common/periph/pm.c
index b56abfda0ad077c67b789f0f3ddc48f331e51cfb..394875e0a9a6ef034b40deaf1f41a5874fc6869e 100644
--- a/cpu/cortexm_common/periph/pm.c
+++ b/cpu/cortexm_common/periph/pm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Kaspar Schleiser <kaspar@schleiser.de
+ * Copyright (C) 2017 Kaspar Schleiser <kaspar@schleiser.de>
  *               2017 Freie Universität Berlin
  *
  * This file is subject to the terms and conditions of the GNU Lesser
diff --git a/examples/default/main.c b/examples/default/main.c
index 3da05daf56c819a372c93704b02853efa4803b89..427c7ec840dc84c9fb57d19e3b3469a241f62150 100644
--- a/examples/default/main.c
+++ b/examples/default/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009, 2010  Kaspar Schleiser <kaspar@schleiser.de>
+ * Copyright (C) 2008, 2009, 2010 Kaspar Schleiser <kaspar@schleiser.de>
  * Copyright (C) 2013 INRIA
  * Copyright (C) 2013 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
diff --git a/sys/include/auto_init.h b/sys/include/auto_init.h
index c98aaecaefa47d29aeae8de05369d3074716605e..c8342ca0cfa41937c04176e3942d92da0e9fac5c 100644
--- a/sys/include/auto_init.h
+++ b/sys/include/auto_init.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010,2015 Freie Universität Berlin
- * Copyright (C) 2010 Kaspar Schleiser
+ * Copyright (C) 2010 Kaspar Schleiser <kaspar@schleiser.de>
  * Copyright (C) 2013 INRIA
  *
  * This file is subject to the terms and conditions of the GNU Lesser
diff --git a/sys/include/shell_commands.h b/sys/include/shell_commands.h
index 9e4eebba0a66f7502109211479e5f4d0343053ca..0c306d093da05b4b6576acff093c28925c2057a8 100644
--- a/sys/include/shell_commands.h
+++ b/sys/include/shell_commands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Kaspar Schleiser
+ * Copyright (C) 2010 Kaspar Schleiser <kaspar@schleiser.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
diff --git a/tests/lwmac/main.c b/tests/lwmac/main.c
index a9e56d215bcf16fa5c5806b780f35f97f5bc342d..e581dcd76fb6d3202e6748c602bcd67e662bfa1b 100644
--- a/tests/lwmac/main.c
+++ b/tests/lwmac/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009, 2010  Kaspar Schleiser <kaspar@schleiser.de>
+ * Copyright (C) 2008, 2009, 2010 Kaspar Schleiser <kaspar@schleiser.de>
  * Copyright (C) 2013 INRIA
  * Copyright (C) 2013 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *