diff --git a/boards/msba2-common/drivers/msba2-ltc4150.c b/boards/msba2-common/drivers/msba2-ltc4150.c
index aba908518..6563602f8 100644
--- a/boards/msba2-common/drivers/msba2-ltc4150.c
+++ b/boards/msba2-common/drivers/msba2-ltc4150.c
@@ -37,7 +37,7 @@ and the mailinglist (subscription via web site)
  * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
  * @author		Heiko Will
  * @author		Michael Baar
- * @author      Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
 #include <stdio.h>
diff --git a/core/bitarithm.c b/core/bitarithm.c
index 94c8e9efd..40eefd7bb 100644
--- a/core/bitarithm.c
+++ b/core/bitarithm.c
@@ -10,7 +10,7 @@
  * \ingroup bitarithm
  * \{
  * \file
- * \author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * \author Kaspar Schleiser <kaspar@schleiser.de>
  * \author Martin Lenders <mlenders@inf.fu-berlin.de>
  * \}
  */
diff --git a/core/clist.c b/core/clist.c
index 8f9895cf1..58b40336f 100644
--- a/core/clist.c
+++ b/core/clist.c
@@ -10,7 +10,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  * @}
  */
 
diff --git a/core/hwtimer.c b/core/hwtimer.c
index ff1700e83..5d2729fa3 100644
--- a/core/hwtimer.c
+++ b/core/hwtimer.c
@@ -12,7 +12,7 @@
  * @file
  * @author      Heiko Will <hwill@inf.fu-berlin.de>
  * @author      Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
- * @author      Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author      Kaspar Schleiser <kaspar@schleiser.de>
  * @author      Oliver Hahm <oliver.hahm@fu-berlin.de>
  * @}
  */
diff --git a/core/include/atomic.h b/core/include/atomic.h
index f657b456a..3ae48d714 100644
--- a/core/include/atomic.h
+++ b/core/include/atomic.h
@@ -11,7 +11,7 @@
  * @{
  * @file
  * @author Freie Universität Berlin, Computer Systems & Telematics
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  */
 
 #ifndef _ATOMIC_H
diff --git a/core/include/bitarithm.h b/core/include/bitarithm.h
index 445389856..1df68464c 100644
--- a/core/include/bitarithm.h
+++ b/core/include/bitarithm.h
@@ -12,7 +12,7 @@
  * @{
  * @file
  * @author Freie Universität Berlin, Computer Systems & Telematics
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  * @author Martin Lenders <mlenders@inf.fu-berlin.de>
  */
 
diff --git a/core/include/clist.h b/core/include/clist.h
index a0d82a286..6d1914948 100644
--- a/core/include/clist.h
+++ b/core/include/clist.h
@@ -13,7 +13,7 @@
  * @{
  * @file
  * @author Freie Universität Berlin, Computer Systems & Telematics
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  */
 
 #ifndef __CLIST_H
diff --git a/core/include/debug.h b/core/include/debug.h
index fafe2abc8..5c928883d 100644
--- a/core/include/debug.h
+++ b/core/include/debug.h
@@ -13,7 +13,7 @@
  * @{
  * @file
  * @author Freie Universität Berlin, Computer Systems & Telematics
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  * @}
  */
 
diff --git a/core/include/flags.h b/core/include/flags.h
index 10ab0538c..ddf61d06b 100644
--- a/core/include/flags.h
+++ b/core/include/flags.h
@@ -10,7 +10,7 @@
  * @ingroup	kernel
  * @{
  * @file
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  */
 
 #ifndef _FLAGS_H
diff --git a/core/include/hwtimer_arch.h b/core/include/hwtimer_arch.h
index 233f95ed7..e3cd785f0 100644
--- a/core/include/hwtimer_arch.h
+++ b/core/include/hwtimer_arch.h
@@ -13,7 +13,7 @@
  * @author Freie Universität Berlin, Computer Systems & Telematics
  * @author Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author Heiko Will <hwill@inf.fu-berlin.de>
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  */
 #ifndef HWTIMER_ARCH_H_
 #define HWTIMER_ARCH_H_
diff --git a/core/include/kernel.h b/core/include/kernel.h
index bb918a822..4a30e97b1 100644
--- a/core/include/kernel.h
+++ b/core/include/kernel.h
@@ -11,7 +11,7 @@
  * @{
  * @file
  * @author Freie Universität Berlin, Computer Systems & Telematics
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  */
 
 #ifndef KERNEL_H_
diff --git a/core/kernel_init.c b/core/kernel_init.c
index 9228ef4ce..70174e0a9 100644
--- a/core/kernel_init.c
+++ b/core/kernel_init.c
@@ -10,7 +10,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  * @}
  */
 
diff --git a/core/msg.c b/core/msg.c
index eb86e2136..988d1ccf8 100644
--- a/core/msg.c
+++ b/core/msg.c
@@ -11,7 +11,7 @@
  * @{
  * @file
  * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  * @author Oliver Hahm <oliver.hahm@inria.fr>
  * @}
  */
diff --git a/core/mutex.c b/core/mutex.c
index 2e1dc1a10..fed10252d 100644
--- a/core/mutex.c
+++ b/core/mutex.c
@@ -10,7 +10,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  * @}
  */
 
diff --git a/core/oneway_malloc.c b/core/oneway_malloc.c
index bc314717a..2a3d7b3c9 100644
--- a/core/oneway_malloc.c
+++ b/core/oneway_malloc.c
@@ -12,7 +12,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  * @}
  */
 
diff --git a/core/queue.c b/core/queue.c
index 6b34f3728..0da47c1c9 100644
--- a/core/queue.c
+++ b/core/queue.c
@@ -10,7 +10,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  * @}
  */
 
diff --git a/core/sched.c b/core/sched.c
index 5012778e4..c391e72f3 100644
--- a/core/sched.c
+++ b/core/sched.c
@@ -12,7 +12,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  * @}
  */
 
diff --git a/core/thread.c b/core/thread.c
index 0ca8106c8..c2c85edd7 100644
--- a/core/thread.c
+++ b/core/thread.c
@@ -10,7 +10,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  * @}
  */
 
diff --git a/cpu/arm_common/arm_cpu.c b/cpu/arm_common/arm_cpu.c
index b934f6145..c70273e6e 100644
--- a/cpu/arm_common/arm_cpu.c
+++ b/cpu/arm_common/arm_cpu.c
@@ -11,7 +11,7 @@
  * @ingroup arch
  * @{
  * @file
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  * @author Heiko Will <heiko.will@fu-berlin.de>
  * @}
  */
diff --git a/drivers/ltc4150/ltc4150.c b/drivers/ltc4150/ltc4150.c
index 0698c681a..3fe8e0319 100644
--- a/drivers/ltc4150/ltc4150.c
+++ b/drivers/ltc4150/ltc4150.c
@@ -23,7 +23,7 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  *
  * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Heiko Will
- * @author      Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
 #include <hwtimer.h>
diff --git a/sys/lib/ringbuffer.c b/sys/lib/ringbuffer.c
index b67f52821..b43ec37f7 100644
--- a/sys/lib/ringbuffer.c
+++ b/sys/lib/ringbuffer.c
@@ -11,7 +11,7 @@
  * @ingroup sys_lib
  * @{
  * @file   ringbuffer.c
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  * @}
  */
 
diff --git a/sys/lib/ringbuffer.h b/sys/lib/ringbuffer.h
index a953bbc87..0146abe37 100644
--- a/sys/lib/ringbuffer.h
+++ b/sys/lib/ringbuffer.h
@@ -11,7 +11,7 @@
  * @ingroup sys_lib
  * @{
  * @file   ringbuffer.h
- * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
  * @}
  */