diff --git a/boards/avsextrem/board_init.c b/boards/avsextrem/board_init.c
index 5ae829fe8796fea4d459e93381f453ee7d798f15..26956f13e2b3b8c3930d9b05a4ccbe5a8b7e07ff 100644
--- a/boards/avsextrem/board_init.c
+++ b/boards/avsextrem/board_init.c
@@ -12,7 +12,6 @@
  * @file
  * @brief       avsextrem board initialization
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Heiko Will
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  * @author      Michael Baar
diff --git a/boards/avsextrem/drivers/avsextrem-cc1100.c b/boards/avsextrem/drivers/avsextrem-cc1100.c
index 49237f0706d65e544ab2d65b66e19cbbe843642a..59ac7802532cf9dd39de8fac2fbf6af6f975b41d 100644
--- a/boards/avsextrem/drivers/avsextrem-cc1100.c
+++ b/boards/avsextrem/drivers/avsextrem-cc1100.c
@@ -13,7 +13,6 @@
  * @ingroup	LPC2387
  * @brief	CC1100 LPC2387 dependend functions
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Heiko Will <hwill@inf.fu-berlin.de>
  * @author      Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
diff --git a/boards/avsextrem/drivers/avsextrem-smb380.c b/boards/avsextrem/drivers/avsextrem-smb380.c
index 017f78249da1dbb822ba1d4d6fa266ddfa190f14..5658a2c238bd986817c5207b9b6aed99dccd4037 100644
--- a/boards/avsextrem/drivers/avsextrem-smb380.c
+++ b/boards/avsextrem/drivers/avsextrem-smb380.c
@@ -14,7 +14,6 @@
  * @brief       SMB380 acceleration sensor driver for the LPC2387 on the
  *              AVSEXTREM board.
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Marco Ziegert <ziegert@inf.fu-berlin.de>
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  * @version     $Revision: 3854 $
diff --git a/boards/avsextrem/drivers/avsextrem-ssp0.c b/boards/avsextrem/drivers/avsextrem-ssp0.c
index 5055cbefbe353f4bd8834dab4f19f725f9b36c2c..5051f82ef5a002f2638eb035f2c29f496bba39de 100644
--- a/boards/avsextrem/drivers/avsextrem-ssp0.c
+++ b/boards/avsextrem/drivers/avsextrem-ssp0.c
@@ -12,7 +12,6 @@
  * @internal
  * @brief       Implements the SPI0 interface for the LPC2387
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Marco Ziegert <ziegert@inf.fu-berlin.de>
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  * @version     $Revision: 3854 $
diff --git a/boards/avsextrem/include/board.h b/boards/avsextrem/include/board.h
index 5a1b11bcb4eb8d69b8a4f54dfcba81192bfec591..2a91c037802f87c5ba121d3681844355e5eaadd4 100644
--- a/boards/avsextrem/include/board.h
+++ b/boards/avsextrem/include/board.h
@@ -16,7 +16,6 @@
  * @file        board.h
  * @brief       Boards specific drivers and configuration for the Avsextrem board
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Heiko Will
  * @author      Zakaria Kasmi
  */
diff --git a/boards/avsextrem/include/configure.h b/boards/avsextrem/include/configure.h
index 64cffecefc7e8679302102c598b5608543d32284..ffee6be5101732da8fb3ba780efcdd5fa68e9c20 100644
--- a/boards/avsextrem/include/configure.h
+++ b/boards/avsextrem/include/configure.h
@@ -11,7 +11,6 @@
  * @file
  * @brief       definitions for the avsextrem board configuration
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      baar
  * @author      Zakaria Kasmi
  * @version     $Revision: 1127 $
diff --git a/boards/avsextrem/include/smb380-board.h b/boards/avsextrem/include/smb380-board.h
index 5c7241c4e36e0e2c136f6340c301ebaa1760544e..2a20ab54d7f50114816d974b1bd0b18629491cd5 100644
--- a/boards/avsextrem/include/smb380-board.h
+++ b/boards/avsextrem/include/smb380-board.h
@@ -12,7 +12,6 @@
  * @internal
  * @brief   SMB380 acceleration sensor definitions for the LPC2387
  *
- * @author  Freie Universität Berlin, Computer Systems & Telematics
  * @author  Marco Ziegert <ziegert@inf.fu-berlin.de>
  * @author  Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  * @version $Revision: 3854 $
diff --git a/boards/avsextrem/include/ssp0-board.h b/boards/avsextrem/include/ssp0-board.h
index f17b3cd82a4ff952a100ed971bf3d831140d8a5b..23f11e842a98950695104347cb80cc1c646a61e0 100644
--- a/boards/avsextrem/include/ssp0-board.h
+++ b/boards/avsextrem/include/ssp0-board.h
@@ -12,7 +12,6 @@
  * @internal
  * @brief       SPI interface definitions for the LPC2387
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Marco Ziegert <ziegert@inf.fu-berlin.de>
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  * @version     $Revision: 3854 $
diff --git a/boards/msba2-common/board_common_init.c b/boards/msba2-common/board_common_init.c
index 2fb719861b212af9e96bdedc3eb6afb3a9306068..3932644246433f8c7fa05bc8acc24311b1c04a45 100644
--- a/boards/msba2-common/board_common_init.c
+++ b/boards/msba2-common/board_common_init.c
@@ -15,7 +15,6 @@
  * @file
  * @brief       MSB-A2 board initialization
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
  * @author      Heiko Will
  * @author      Kaspar Schleiser
  * @author      Michael Baar <baar@inf.fu-berlin.de>
diff --git a/boards/msba2-common/drivers/msba2-ltc4150.c b/boards/msba2-common/drivers/msba2-ltc4150.c
index e2f891bd4585c7ea1dba9583a20680c0b4126819..1fcc0f2204af271469ea0c5744d084a8d1a6e04f 100644
--- a/boards/msba2-common/drivers/msba2-ltc4150.c
+++ b/boards/msba2-common/drivers/msba2-ltc4150.c
@@ -16,7 +16,6 @@
  * @file
  * @brief		LTC4150 MSB-A2 specific implemetation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
  * @author		Heiko Will
  * @author		Michael Baar
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
diff --git a/boards/msba2-common/drivers/msba2-uart0.c b/boards/msba2-common/drivers/msba2-uart0.c
index 3abbcb24a8b967b0f61f3f6c4538a491160c3336..1fd961a9fea596eeabe9c0a5b5e1a384823e8d1f 100644
--- a/boards/msba2-common/drivers/msba2-uart0.c
+++ b/boards/msba2-common/drivers/msba2-uart0.c
@@ -9,8 +9,8 @@
 /*
  * debug_uart.c: provides initial serial debug output
  *
- * Copyright (C) 2008, 2009  Kaspar Schleiser <kaspar@schleiser.de>
- *                           Heiko Will <hwill@inf.fu-berlin.de>
+ * @author Kaspar Schleiser <kaspar@schleiser.de>
+ * @author Heiko Will <hwill@inf.fu-berlin.de>
  */
 #include <stdlib.h>
 #include <string.h>
@@ -25,7 +25,6 @@
  * @file
  * @ingroup     lpc2387
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
  * @version     $Revision$
  *
  * @note    $Id$
diff --git a/boards/msba2-common/include/msba2_common.h b/boards/msba2-common/include/msba2_common.h
index 8e43116d20b6206947265121b6be8b00c6732cbe..16b9961d354e3be86f79b0ca5ee885fe62dae37c 100644
--- a/boards/msba2-common/include/msba2_common.h
+++ b/boards/msba2-common/include/msba2_common.h
@@ -7,7 +7,6 @@
  * @files       msba2-common.h
  * @brief       MSB-A2 Common Board Definitions
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 #ifndef __MSBA2_COMMON_H
diff --git a/boards/msba2/board_init.c b/boards/msba2/board_init.c
index 7def2feeec9226f28660b6e514a7da2abc08b738..617b51d60b8de7385010c1e27c23c1d8bd7ea133 100644
--- a/boards/msba2/board_init.c
+++ b/boards/msba2/board_init.c
@@ -15,7 +15,6 @@
  * @file
  * @brief       MSB-A2 board initialization
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
  * @author      Heiko Will
  * @author      Kaspar Schleiser
  * @author      Michael Baar <baar@inf.fu-berlin.de>
diff --git a/boards/msba2/msba2-cc110x.c b/boards/msba2/msba2-cc110x.c
index 6c9bf97ffe76cd4146ec0e38534c2f039a2432bd..7eba7b49aae0519d5b7c3e98da79b4cc305ce460 100644
--- a/boards/msba2/msba2-cc110x.c
+++ b/boards/msba2/msba2-cc110x.c
@@ -11,7 +11,6 @@
  * @ingroup		LPC2387
  * @brief		CC1100 LPC2387 dependend functions
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @version     $Revision: 1781 $
diff --git a/boards/pttu/include/board.h b/boards/pttu/include/board.h
index 3890f4cbe566f63eb92ece00445acc3ca342a010..3985f73995073499fee1353aa53e0e2ef50edde9 100644
--- a/boards/pttu/include/board.h
+++ b/boards/pttu/include/board.h
@@ -7,7 +7,6 @@
  * @file        board.h
  * @brief       Basic definitions for the PTTU board
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/boards/wsn430-v1_3b/include/board.h b/boards/wsn430-v1_3b/include/board.h
index 6ffa51610db4f656fc8af7dc8dd58c743c91c63e..e11ddb85e340a14bbaf7f58346d1e8489873f86b 100644
--- a/boards/wsn430-v1_3b/include/board.h
+++ b/boards/wsn430-v1_3b/include/board.h
@@ -19,7 +19,6 @@
  * @file        board.h
  * @brief       Basic definitions for the Senslab WSN430 v1.3b board
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
  * @author      Milan Babel <babel@inf.fu-berlin.de>
  */
 
diff --git a/boards/wsn430-v1_4/include/board.h b/boards/wsn430-v1_4/include/board.h
index c7b18f8475955ffdc701be56213a86c6b194f4ef..7080c8bb09e80920eaa0a827fc002a4ca3886b7f 100644
--- a/boards/wsn430-v1_4/include/board.h
+++ b/boards/wsn430-v1_4/include/board.h
@@ -19,7 +19,6 @@
  * @file        board.h
  * @brief       Basic definitions for the Senslab WSN430 v1.4 board
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
  * @author      Milan Babel <babel@inf.fu-berlin.de>
  */
 
diff --git a/core/cib.c b/core/cib.c
index 39150dd4697730a46a509dc5a785db8ce2f7c890..0d18bb12e4eeac5b9bfb872d72dac0bc94feb9d3 100644
--- a/core/cib.c
+++ b/core/cib.c
@@ -13,7 +13,6 @@
  * @file        cib.c
  * @brief       Circular integer buffer implementation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  *
  * @}
diff --git a/core/include/atomic.h b/core/include/atomic.h
index 621157d60d307a8d05f30d9a2728a99ca356b26c..05bbe2d8d6afca7d85b17d52a0da4526d8782768 100644
--- a/core/include/atomic.h
+++ b/core/include/atomic.h
@@ -13,7 +13,6 @@
  * @file        atomic.h
  * @brief       Atomic getter and setter functions
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/core/include/attributes.h b/core/include/attributes.h
index b1efec6dbf4566fc1d5c8e129391744643c5bae6..294d58fd36fbfa64bf57846ea6567fe22634367c 100644
--- a/core/include/attributes.h
+++ b/core/include/attributes.h
@@ -13,7 +13,6 @@
  * @file        attributes.h
  * @brief       Compiler attributes/pragmas configuration
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
diff --git a/core/include/bitarithm.h b/core/include/bitarithm.h
index 696f68e71e2f5323da53d0af022111ebc0fc0b46..0a5df4e50b3856e4084c70aaaaffa04a3c99e6c4 100644
--- a/core/include/bitarithm.h
+++ b/core/include/bitarithm.h
@@ -13,7 +13,6 @@
  * @file        bitarithm.h
  * @brief       Helper functions for bit arithmetic
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @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 de4335139715cde0fa69a0531446329a5ab458c7..128ec9555a996c02f3ed1957e66643b27f087e61 100644
--- a/core/include/clist.h
+++ b/core/include/clist.h
@@ -13,7 +13,6 @@
  * @file        clist.h
  * @brief       Circular linked list
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/core/include/debug.h b/core/include/debug.h
index 15fcfc794079792816db45a203e815fdec4fa847..b056cc823814ce6464b0dfcbb15d7dad0ae3d05e 100644
--- a/core/include/debug.h
+++ b/core/include/debug.h
@@ -15,7 +15,6 @@
  *
  * #define ENABLE_DEBUG, include this and then use DEBUG as printf you can toggle.
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/core/include/hwtimer.h b/core/include/hwtimer.h
index 0a92b14d34cbd4f270f2be23c9c4c0b6f838be2e..9ad9c048a8da0b4981753cd1624280b20dc11d8c 100644
--- a/core/include/hwtimer.h
+++ b/core/include/hwtimer.h
@@ -25,7 +25,6 @@
  * @file        hwtimer.h
  * @brief       HW-timer abstraction
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Heiko Will
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  * @author      Michael Baar
diff --git a/core/include/kernel.h b/core/include/kernel.h
index a781fc92062ebaaa37360d39863dca4c9a99df9d..d30989971367fed8580c6789bf780e455680bdbd 100644
--- a/core/include/kernel.h
+++ b/core/include/kernel.h
@@ -16,7 +16,6 @@
  *              A reboot() function is also provided
  *              (and used by core_panic() when needed).
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/core/include/msg.h b/core/include/msg.h
index fe29e23c02e5dbd85d42189d799f0a1287d5d788..1d2fd91c0c305b7684fe80c5d238b2a1c533beeb 100644
--- a/core/include/msg.h
+++ b/core/include/msg.h
@@ -25,7 +25,6 @@
  * @file        msg.h
  * @brief       Messaging API for inter process communication
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  * @author      Kévin Roussel <Kevin.Roussel@inria.fr>
  */
diff --git a/core/include/queue.h b/core/include/queue.h
index 8d9416f056bbd7c9da0b443bc59a2a0ab7fdbc83..20c6b007db904a4239ccdbcec2ae1f435d92c809 100644
--- a/core/include/queue.h
+++ b/core/include/queue.h
@@ -13,7 +13,6 @@
  * @file        queue.h
  * @brief       A simple queue implementation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/core/include/sched.h b/core/include/sched.h
index e024765cf3068ee02cc8cbde8f0b36c730a2051f..729027f2c5bc4600a015945909f0441ec20cbcc6 100644
--- a/core/include/sched.h
+++ b/core/include/sched.h
@@ -15,7 +15,6 @@
  * @file        sched.h
  * @brief       Scheduler API definion
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/core/include/tcb.h b/core/include/tcb.h
index 3bbac882bc1c2950a3d0c09a21ebda7a50c96a47..bcba706facc48d71f29615743a9c1dd8c9d9d895 100644
--- a/core/include/tcb.h
+++ b/core/include/tcb.h
@@ -13,7 +13,6 @@
  * @file        tcb.h
  * @brief       Thread context block definition
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Heiko Will
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
diff --git a/core/include/thread.h b/core/include/thread.h
index e4097afc6509f8d956759fe53fc617fbab5af397..92659df2463e908f2967ff684217e18cdf84296c 100644
--- a/core/include/thread.h
+++ b/core/include/thread.h
@@ -15,7 +15,6 @@
  * @file        thread.h
  * @brief       Threading API
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/core/msg.c b/core/msg.c
index 3d50fb1b34ad52dbf80a92dfabe9c174f339ca4c..c3a369e07685f1ccf6542edd2223d29d6be4420e 100644
--- a/core/msg.c
+++ b/core/msg.c
@@ -13,7 +13,6 @@
  * @file
  * @brief       Kernel messaging implementation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  * @author      Kévin Roussel <Kevin.Roussel@inria.fr>
diff --git a/core/queue.c b/core/queue.c
index 5a8ed565689758ff0afce2ecb4c3a214237c443b..8d65df38760eb1899e4213498044ee7bb6c0e04a 100644
--- a/core/queue.c
+++ b/core/queue.c
@@ -13,7 +13,6 @@
  * @file        queue.c
  * @brief       A simple queue implementation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  * @}
  */
diff --git a/core/sched.c b/core/sched.c
index 3c02b82cce3964729c919e9e494cb222689389b1..929770e11e95a159a37f549f50d9950034ecdc25 100644
--- a/core/sched.c
+++ b/core/sched.c
@@ -13,7 +13,6 @@
  * @file        sched.c
  * @brief       Scheduler implementation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  *
  * @}
diff --git a/cpu/arm_common/bootloader.c b/cpu/arm_common/bootloader.c
index 0234cbbbbb77bf8adebd784d5097f88b0e15155a..00b8bac050e4cb6a2a58a9f4ea765e8c493b595b 100644
--- a/cpu/arm_common/bootloader.c
+++ b/cpu/arm_common/bootloader.c
@@ -21,7 +21,6 @@
  * @internal
  * @brief       ARM bootloader
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Heiko Will <hwill@inf.fu-berlin.de>
  * @author      Michael Baar <michael.baar@fu-berlin.de>
  * @version     $Revision$
diff --git a/cpu/arm_common/gettimeofday.c b/cpu/arm_common/gettimeofday.c
index ef96fb255dc5ed45a95dce7239f2443c7485ed05..0406753efdb3698aaa2fca296acab2af486dfc5c 100644
--- a/cpu/arm_common/gettimeofday.c
+++ b/cpu/arm_common/gettimeofday.c
@@ -13,7 +13,6 @@
  * @ingroup     arm_common
  * @brief       LPC2387 Newlib gettimeofday() system call glue
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Michael Baar <michael.baar@fu-berlin.de>
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
diff --git a/cpu/arm_common/syscalls.c b/cpu/arm_common/syscalls.c
index c483d8de836b026eeb0e206fe078ff926d6f1c8c..d6612c33f58c8c43027ea577c562ce0c1474b0ef 100644
--- a/cpu/arm_common/syscalls.c
+++ b/cpu/arm_common/syscalls.c
@@ -14,7 +14,6 @@
  * @ingroup     arm_common
  * @brief       LPC2387 NewLib system calls implementation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Michael Baar <michael.baar@fu-berlin.de>
  *
  */
diff --git a/cpu/lpc2387/gpioint/lpc2387-gpioint.c b/cpu/lpc2387/gpioint/lpc2387-gpioint.c
index 17f9f4cd9cbbc6bcc2829c11c7c7e7f608f2f042..7f8dc8bf45deb5e369c72ea1e73006525ea45105 100644
--- a/cpu/lpc2387/gpioint/lpc2387-gpioint.c
+++ b/cpu/lpc2387/gpioint/lpc2387-gpioint.c
@@ -19,7 +19,6 @@ See the file LICENSE in the top level directory for more details.
  * @file
  * @brief       LPC2387 GPIO Interrupt Multiplexer implementation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Michael Baar <michael.baar@fu-berlin.de>
  * @version     $Revision: 1508 $
  *
diff --git a/cpu/lpc2387/i2c/i2c.c b/cpu/lpc2387/i2c/i2c.c
index 73121a08a7763dc03b895dce37d83c65c0bcc509..4483c04b1260341eb7b596c4e0691b8262b78d7d 100644
--- a/cpu/lpc2387/i2c/i2c.c
+++ b/cpu/lpc2387/i2c/i2c.c
@@ -17,7 +17,6 @@
  *              user does not declare a handler, an appropriate interrupt is
  *              automatically registered for the specific i2c interface.
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  * @author      Marco Ziegert <ziegert@inf.fu-berlin.de>
  * @author      Benjamin Aschenbrenner
diff --git a/cpu/lpc2387/include/cpu-conf.h b/cpu/lpc2387/include/cpu-conf.h
index c18eac30278bbc4f4a882eff6e219c3c04fb0156..ad88f842f0315aeed795e6930dab061d3589e915 100644
--- a/cpu/lpc2387/include/cpu-conf.h
+++ b/cpu/lpc2387/include/cpu-conf.h
@@ -24,7 +24,6 @@ See the file LICENSE in the top level directory for more details.
  * @file
  * @brief		LPC2387 CPUconfiguration
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		baar
  * @version     $Revision$
  *
diff --git a/cpu/lpc2387/include/i2c.h b/cpu/lpc2387/include/i2c.h
index 866190499891eb32aaeaf7f1e3d306d26ddc5c4e..d3803acdafbac1a77d11852a346a2728e0eb95c4 100644
--- a/cpu/lpc2387/include/i2c.h
+++ b/cpu/lpc2387/include/i2c.h
@@ -19,7 +19,6 @@
  *              does not declare a handler, an appropriate interrupt is
  *              automatically registered for the specific i2c-interface.
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  * @author      Marco Ziegert <ziegert@inf.fu-berlin.de>
  * @author      Benjamin Aschenbrenner
diff --git a/cpu/lpc2387/include/lpc2387-adc.h b/cpu/lpc2387/include/lpc2387-adc.h
index 46b65b7f566d807663671ea607d543c83ae76c9c..2b52c701be8b370fe2e101c9ba3cd5bf20908d34 100644
--- a/cpu/lpc2387/include/lpc2387-adc.h
+++ b/cpu/lpc2387/include/lpc2387-adc.h
@@ -24,7 +24,6 @@ See the file LICENSE in the top level directory for more details.
  * @file
  * @brief		LPC2387 ADC
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @version     $Revision: 3249 $
  *
diff --git a/cpu/lpc2387/lpc2387-adc.c b/cpu/lpc2387/lpc2387-adc.c
index 2eb1d38a887e5714eb02546b3589ce24eb80b774..5fc37953a51be95383d65c0a562f49247200041d 100644
--- a/cpu/lpc2387/lpc2387-adc.c
+++ b/cpu/lpc2387/lpc2387-adc.c
@@ -15,7 +15,6 @@ See the file LICENSE in the top level directory for more details.
  * @ingroup		lpc2387_adc
  * @brief		LPC2387 ADC
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @version     $Revision: 3250 $
  *
diff --git a/cpu/lpc2387/lpc2387-lpm.c b/cpu/lpc2387/lpc2387-lpm.c
index dd8e74ba04a8dd1caebd397447a67485a3df477d..e9a05c595cd4a670799031fbd2781ebeed20a00a 100644
--- a/cpu/lpc2387/lpc2387-lpm.c
+++ b/cpu/lpc2387/lpc2387-lpm.c
@@ -21,7 +21,6 @@ See the file LICENSE in the top level directory for more details.
  * @brief		LPC2387 Low-Power management
  * @ingroup		lpc2387
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author 		Heiko Will
  * @version     $Revision$
  *
diff --git a/cpu/lpc2387/rtc/lpc2387-rtc.c b/cpu/lpc2387/rtc/lpc2387-rtc.c
index 811bd2639cce3e9014055b6a462f9ced5dc9c31f..96d988559285ebc443d9ed017ed2bf78574df813 100644
--- a/cpu/lpc2387/rtc/lpc2387-rtc.c
+++ b/cpu/lpc2387/rtc/lpc2387-rtc.c
@@ -15,7 +15,6 @@ See the file LICENSE in the top level directory for more details.
  * @ingroup		lpc2387_rtc
  * @brief		LPC2387 Real-Time-Clock
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Michael Baar <michael.baar@fu-berlin.de>
  * @version     $Revision: 2005 $
  *
diff --git a/cpu/lpc_common/hwtimer_cpu.c b/cpu/lpc_common/hwtimer_cpu.c
index 052fb68c5dd4c71b966e2467ccea5434ab3db466..a6cebd88ade0a2e825015b9f8783544b7ce9d38b 100644
--- a/cpu/lpc_common/hwtimer_cpu.c
+++ b/cpu/lpc_common/hwtimer_cpu.c
@@ -11,7 +11,6 @@
  * @internal
  * @brief       ARM kernel timer CPU dependent functions implementation
  *
- * @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      Oliver Hahm <oliver.hahm@inria.fr>
diff --git a/dist/tools/linux-border_router/flowcontrol.h b/dist/tools/linux-border_router/flowcontrol.h
index a96ec782636d6b73315d37c29b3936c124b88b5c..3956c6ca7c3490e6ade86202cf82ef14d7c12306 100644
--- a/dist/tools/linux-border_router/flowcontrol.h
+++ b/dist/tools/linux-border_router/flowcontrol.h
@@ -8,7 +8,6 @@
 
 /**
  * @file    flowcontrol.h
- * @author  Freie Universität Berlin, Computer Systems & Telemetics
  * @author  Martin Lenders <mlenders@inf.fu-berlin.de>
  * @brief   Public declarations for the flow control jobs via the
  *          serial interface for the 6LoWPAN Border Router driver.
diff --git a/dist/tools/linux-border_router/multiplex.h b/dist/tools/linux-border_router/multiplex.h
index 42c8b332cbf417377a6be2b646206058574a8120..a84127446cb4ad058b699042b81951aed0eb48b9 100644
--- a/dist/tools/linux-border_router/multiplex.h
+++ b/dist/tools/linux-border_router/multiplex.h
@@ -8,7 +8,6 @@
 
 /**
  * @file    multiplex.h
- * @author  Freie Universität Berlin, Computer Systems & Telemetics
  * @author  Martin Lenders <mlenders@inf.fu-berlin.de>
  * @brief   Public declarations for the multiplexing jobs via the
  *          serial interface for the 6LoWPAN Border Router driver.
diff --git a/dist/tools/linux-border_router/serialnumber.h b/dist/tools/linux-border_router/serialnumber.h
index 3e0094c96ff119cc0cf64d616f8c2580c5be8008..202bfa72f179cb64c2ea544cf705937d801f521a 100644
--- a/dist/tools/linux-border_router/serialnumber.h
+++ b/dist/tools/linux-border_router/serialnumber.h
@@ -8,7 +8,6 @@
 
 /**
  * @file    serialnumber.h
- * @author  Freie Universität Berlin, Computer Systems & Telemetics
  * @author  Martin Lenders <mlenders@inf.fu-berlin.de>
  * @brief   Serial number arithmetics after RFC 1982, section 3
  */
diff --git a/dist/tools/linux-border_router/sixlowdriver.h b/dist/tools/linux-border_router/sixlowdriver.h
index cc9d48d382dea07886a070bb835ef82c500d9afb..1af3acc71a0d4d1a20a6e738cfa39f77e2b3c20b 100644
--- a/dist/tools/linux-border_router/sixlowdriver.h
+++ b/dist/tools/linux-border_router/sixlowdriver.h
@@ -8,7 +8,6 @@
 
 /**
  * @file    sixlowdriver.h
- * @author  Freie Universität Berlin, Computer Systems & Telemetics
  * @author  Martin Lenders <mlenders@inf.fu-berlin.de>
  * @brief   Public declarations for the 6LoWPAN Border Router driver.
  */
diff --git a/dist/tools/linux-border_router/testing.h b/dist/tools/linux-border_router/testing.h
index a013086cd5096a1f4ab609f2c3839846a1eef676..2c4616500b6ffed5e5cc7bdbce7137641983e124 100644
--- a/dist/tools/linux-border_router/testing.h
+++ b/dist/tools/linux-border_router/testing.h
@@ -16,7 +16,6 @@
  *          wants to measure by calling testing_start() to start the
  *          measuring and testing_stop() to end it.
  *
- * @author  Freie Universität Berlin, Computer Systems & Telemetics
  * @author  Martin Lenders <mlenders@inf.fu-berlin.de>
  */
 
diff --git a/drivers/cc110x/arch_cc1100.h b/drivers/cc110x/arch_cc1100.h
index 132a7a061d10239cc77179211b72313201d8d7dc..461ae74f6b11a5e4e7ed3b866251c6d8882d6597 100644
--- a/drivers/cc110x/arch_cc1100.h
+++ b/drivers/cc110x/arch_cc1100.h
@@ -17,7 +17,6 @@
  * @ingroup		LPC2387
  * @brief		CC1100 LPC2387 dependend functions
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 1775 $
  *
diff --git a/drivers/cc110x/cc1100-csmaca-mac.c b/drivers/cc110x/cc1100-csmaca-mac.c
index 371bc45f5e69dd6d713d1397bef3d2d180cce280..4af3dd94cb2034bbbe2ffe38db1e7a0327ae6719 100644
--- a/drivers/cc110x/cc1100-csmaca-mac.c
+++ b/drivers/cc110x/cc1100-csmaca-mac.c
@@ -17,7 +17,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @ingroup		dev_cc110x
  * @brief		ScatterWeb MSB-A2 mac-layer
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 2128 $
diff --git a/drivers/cc110x/cc1100-csmaca-mac.h b/drivers/cc110x/cc1100-csmaca-mac.h
index e5c0d815c198da635ce3d5be631a558b30feb2d9..9cf0eee26bcc59af910b567c0d570694d19777cf 100644
--- a/drivers/cc110x/cc1100-csmaca-mac.h
+++ b/drivers/cc110x/cc1100-csmaca-mac.h
@@ -17,7 +17,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @ingroup		dev_cc110x
  * @brief		ScatterWeb MSB-A2 mac-layer
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 1999 $
diff --git a/drivers/cc110x/cc1100-defaultSettings.c b/drivers/cc110x/cc1100-defaultSettings.c
index 8f68b5944630aef3e0c1660bf87fd84df63f479b..6d940ac45f6208085ed38a1498ffc05041a82ee9 100644
--- a/drivers/cc110x/cc1100-defaultSettings.c
+++ b/drivers/cc110x/cc1100-defaultSettings.c
@@ -21,7 +21,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @file
  * @brief		TI Chipcon CC110x default settings
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 2058 $
diff --git a/drivers/cc110x/cc1100-defaultSettings.h b/drivers/cc110x/cc1100-defaultSettings.h
index 6b2a71ec9019df98b9fb6a06d01f3856b4dec516..c8f6a6d15bd3290177e49b5164bae165ccef21d5 100644
--- a/drivers/cc110x/cc1100-defaultSettings.h
+++ b/drivers/cc110x/cc1100-defaultSettings.h
@@ -24,7 +24,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @file
  * @brief		TI Chipcon CC110x default settings
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 2139 $
diff --git a/drivers/cc110x/cc1100-internal.h b/drivers/cc110x/cc1100-internal.h
index cd51e283d5ba4e562ea66c7cb3611509af9ab268..e263983e4624873dc3ac35dc5f79993618c8c190 100644
--- a/drivers/cc110x/cc1100-internal.h
+++ b/drivers/cc110x/cc1100-internal.h
@@ -25,7 +25,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @internal
  * @brief		TI Chipcon CC110x internal hardware constants
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 1231 $
diff --git a/drivers/cc110x/cc1100.c b/drivers/cc110x/cc1100.c
index 005f3d7f111183aae3bf6f3cc36494fa1fa455af..a4a1b8ed0e56c2658f596109c1262eecd0766874 100644
--- a/drivers/cc110x/cc1100.c
+++ b/drivers/cc110x/cc1100.c
@@ -19,7 +19,6 @@
  * @internal
  * @brief		TI Chipcon CC110x Radio driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 2283 $
diff --git a/drivers/cc110x/cc1100.h b/drivers/cc110x/cc1100.h
index ae53f18adc7af3745f89d2706a43daffdbaae3ca..e91ee8e6ef2491f1d403f8f6898773835f438f53 100644
--- a/drivers/cc110x/cc1100.h
+++ b/drivers/cc110x/cc1100.h
@@ -25,7 +25,6 @@
  * @file
  * @brief       TI Chipcon CC110x radio driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author      Heiko Will <hwill@inf.fu-berlin.de>
  */
diff --git a/drivers/cc110x/cc1100_phy.c b/drivers/cc110x/cc1100_phy.c
index 4bbc95162291338053768051617886a098859c08..82992342f2302e1cf7c46cc7a3425dd115021e7c 100644
--- a/drivers/cc110x/cc1100_phy.c
+++ b/drivers/cc110x/cc1100_phy.c
@@ -22,7 +22,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @internal
  * @brief		TI Chipcon CC110x physical radio driver
  *
- * @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      Oliver Hahm <oliver.hahm@inria.fr>
diff --git a/drivers/cc110x/cc1100_phy.h b/drivers/cc110x/cc1100_phy.h
index 7e1657c84a4c3ebab37206de6f1f8abc3c6734bf..f39a16811d814b613244c2cb41b288d01fc9d570 100644
--- a/drivers/cc110x/cc1100_phy.h
+++ b/drivers/cc110x/cc1100_phy.h
@@ -22,7 +22,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @internal
  * @brief		TI Chipcon CC110x physical radio driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 1285 $
diff --git a/drivers/cc110x/cc1100_spi.c b/drivers/cc110x/cc1100_spi.c
index 6a1a7847365e6acffa707870ab38b98db9287dc7..85036aae014961c6729ae1b2bc2b0f434da6540b 100644
--- a/drivers/cc110x/cc1100_spi.c
+++ b/drivers/cc110x/cc1100_spi.c
@@ -22,7 +22,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @internal
  * @brief		TI Chipcon CC1100 SPI driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 1775 $
diff --git a/drivers/cc110x/cc1100_spi.h b/drivers/cc110x/cc1100_spi.h
index cf39e016bc0b1285c319ba63098d6374d32f8721..dd5f292922a99c26c0d515d355f3b51503dc5a8b 100644
--- a/drivers/cc110x/cc1100_spi.h
+++ b/drivers/cc110x/cc1100_spi.h
@@ -22,7 +22,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @internal
  * @brief		TI Chipcon CC1100 SPI driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 1775 $
diff --git a/drivers/cc110x_ng/cc110x-defaultSettings.c b/drivers/cc110x_ng/cc110x-defaultSettings.c
index b428d1a4d32994b0a87e7ea74844ce36b5cfc299..38f65fcf88d5cf6595f234aa0c2009dc01c0fa25 100644
--- a/drivers/cc110x_ng/cc110x-defaultSettings.c
+++ b/drivers/cc110x_ng/cc110x-defaultSettings.c
@@ -13,7 +13,6 @@
  * @file
  * @brief   TI Chipcon CC110x default settings
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      INRIA
  * @author    Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author    Heiko Will <hwill@inf.fu-berlin.de>
diff --git a/drivers/cc110x_ng/cc110x-internal.h b/drivers/cc110x_ng/cc110x-internal.h
index b1b1b6c3321902e7302ffb481bfb4f82190c61ba..4d8c9d89825de465906eea9996395c24166a8b63 100644
--- a/drivers/cc110x_ng/cc110x-internal.h
+++ b/drivers/cc110x_ng/cc110x-internal.h
@@ -14,7 +14,6 @@
  * @file        cc110x-internal.h
  * @brief       Driver internal constants for 110x chip configuration
  *
- * @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      Oliver Hahm <oliver.hahm@inria.fr>
diff --git a/drivers/cc110x_ng/spi/cc110x_spi.c b/drivers/cc110x_ng/spi/cc110x_spi.c
index 3d73abacf8d99a43b5ec4bc3a86c80be07b4b8ac..f687ba2c2d430a67e34d02dcd6d80e736228e0bf 100644
--- a/drivers/cc110x_ng/spi/cc110x_spi.c
+++ b/drivers/cc110x_ng/spi/cc110x_spi.c
@@ -19,7 +19,6 @@
  * @file        cc110x_spi.c
  * @brief       TI Chipcon CC1100 SPI driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author      Heiko Will <hwill@inf.fu-berlin.de>
  * @}
diff --git a/drivers/cc2420/include/cc2420_arch.h b/drivers/cc2420/include/cc2420_arch.h
index 2b7e6a5d5371f791b137bd7c24f96b846d69e3ac..de96a2719b3675df64a3f942139c694ca8265395 100644
--- a/drivers/cc2420/include/cc2420_arch.h
+++ b/drivers/cc2420/include/cc2420_arch.h
@@ -17,7 +17,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @ingroup		CC2420
  * @brief		CC2420 dependend functions
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @author      Milan Babel <babel@inf.fu-berlin.de>
  * @author      Kévin Roussel <Kevin.Roussel@inria.fr>
diff --git a/drivers/include/cc110x/cc1100-interface.h b/drivers/include/cc110x/cc1100-interface.h
index cee27deafbd55a7411f5ad58ebc11a43dd4f78a9..802ae131d8466e3289a8a56c6a68ce0abf9a9fba 100644
--- a/drivers/include/cc110x/cc1100-interface.h
+++ b/drivers/include/cc110x/cc1100-interface.h
@@ -21,7 +21,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @file
  * @brief		TI Chipcon CC110x public interface
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @version     $Revision: 2283 $
  *
diff --git a/drivers/include/cc110x_ng/cc110x-arch.h b/drivers/include/cc110x_ng/cc110x-arch.h
index e32417bad035398f98c158a0aae247851c5cde8f..6acde9bbd0f6fde789c340b1256e8c053b9cda70 100644
--- a/drivers/include/cc110x_ng/cc110x-arch.h
+++ b/drivers/include/cc110x_ng/cc110x-arch.h
@@ -19,7 +19,6 @@
  * @file        cc110x-arch.h
  * @brief       CC1100 architecture dependent functions
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Heiko Will <hwill@inf.fu-berlin.de>
  */
 
diff --git a/drivers/include/cc110x_ng/cc110x-defaultSettings.h b/drivers/include/cc110x_ng/cc110x-defaultSettings.h
index bb08de084dcccf860205e7c85317fa49bf795365..99f54d5d6fd269240450cc6e0ffd5e686a4e9729 100644
--- a/drivers/include/cc110x_ng/cc110x-defaultSettings.h
+++ b/drivers/include/cc110x_ng/cc110x-defaultSettings.h
@@ -22,7 +22,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @file
  * @brief       TI Chipcon CC110x default settings
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author      Heiko Will <hwill@inf.fu-berlin.de>
  */
diff --git a/drivers/include/cc110x_ng/cc110x_spi.h b/drivers/include/cc110x_ng/cc110x_spi.h
index 65643fa217868d6ec0b423acfc6819e3e90c2185..5f87f9e493e4ecaaf10cb9cfa56cea164577d1a4 100644
--- a/drivers/include/cc110x_ng/cc110x_spi.h
+++ b/drivers/include/cc110x_ng/cc110x_spi.h
@@ -19,7 +19,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @file
  * @brief       TI Chipcon CC1100 SPI driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author      Heiko Will <hwill@inf.fu-berlin.de>
  */
diff --git a/drivers/include/gpioint.h b/drivers/include/gpioint.h
index 644c90d775951cf4376840acdf46a0a29bfc9f15..4a1fcb605d521c3a726584a8dc49d7c4fe1ef640 100644
--- a/drivers/include/gpioint.h
+++ b/drivers/include/gpioint.h
@@ -27,7 +27,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @file
  * @brief       GPIO IRQ Multiplexer interface
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Michael Baar <michael.baar@fu-berlin.de>
  */
 
diff --git a/drivers/include/lm75a-temp-sensor.h b/drivers/include/lm75a-temp-sensor.h
index 9af33e42f8807c5440363ee87f67f15d79f9e007..9e8f7a896c10f58eb420f62794f0d5a39d6d5d6f 100644
--- a/drivers/include/lm75a-temp-sensor.h
+++ b/drivers/include/lm75a-temp-sensor.h
@@ -20,7 +20,6 @@
  *
  * The connection between the LM75A and the MCU is based on the I2C-interface.
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  */
 
diff --git a/drivers/include/ltc4150_arch.h b/drivers/include/ltc4150_arch.h
index a459630935899bec391bcd8b828d6a952a3ef914..252c253378135cb93284af3c79ebe7f161c19d62 100644
--- a/drivers/include/ltc4150_arch.h
+++ b/drivers/include/ltc4150_arch.h
@@ -24,7 +24,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @file        ltc4150_arch.h
  * @brief       LTC4150 Coulomb Counter
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Heiko Will
  */
 
diff --git a/drivers/include/srf02-ultrasonic-sensor.h b/drivers/include/srf02-ultrasonic-sensor.h
index 0af64596ce8d2bb525dd3b48ff972fc0bb8b704c..96f0a5fd583850d062128623438f75c148809f1a 100644
--- a/drivers/include/srf02-ultrasonic-sensor.h
+++ b/drivers/include/srf02-ultrasonic-sensor.h
@@ -19,7 +19,6 @@
  *
  * The connection between the SRF02 and the MCU is based on the i2c interface.
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  */
 
diff --git a/drivers/include/srf08-ultrasonic-sensor.h b/drivers/include/srf08-ultrasonic-sensor.h
index 4371d1a719534ec7e6c835f39730e82012f1d757..2b45fe391b06a48cd3019031bf8aefc8d60446b3 100644
--- a/drivers/include/srf08-ultrasonic-sensor.h
+++ b/drivers/include/srf08-ultrasonic-sensor.h
@@ -20,7 +20,6 @@
  *
  * The communication between the MCU and SRF08 is via the i2c interface.
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  */
 
diff --git a/drivers/lm75a/lm75a-temp-sensor.c b/drivers/lm75a/lm75a-temp-sensor.c
index ff5a8cbd02c8c2e8c9e1136aca0965e63487a815..c2a198a05ea4c8c577bb668ff1ab04bc7af87d74 100644
--- a/drivers/lm75a/lm75a-temp-sensor.c
+++ b/drivers/lm75a/lm75a-temp-sensor.c
@@ -16,7 +16,6 @@
  *              The communication between the LM75A and the MCU is
  *              based on the i2c interface.
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  * @version     $Revision: 3855 $
  *
diff --git a/drivers/ltc4150/ltc4150.c b/drivers/ltc4150/ltc4150.c
index 3fe8e0319f5a96b55bea60f26886397299854d41..b6534d30e37a491e6ff636bc65e66b0d8940868b 100644
--- a/drivers/ltc4150/ltc4150.c
+++ b/drivers/ltc4150/ltc4150.c
@@ -21,7 +21,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @file
  * @brief       LTC4150 Coulomb Counter
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Heiko Will
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
diff --git a/drivers/sht11/sht11.c b/drivers/sht11/sht11.c
index 0821c0d666a1199a78e61eb27bf1b0c4f8678aaa..48d3209f6feafc731ca672298162ea0cc5a1fe7e 100644
--- a/drivers/sht11/sht11.c
+++ b/drivers/sht11/sht11.c
@@ -23,7 +23,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @file
  * @brief		SHT11 Device Driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @version     $Revision: 2396 $
  *
  * @note		$Id: sht11.c 2396 2010-07-06 15:12:35Z ziegert $
diff --git a/drivers/srf02/srf02-ultrasonic-sensor.c b/drivers/srf02/srf02-ultrasonic-sensor.c
index adb9cfc83f2279d73ad3565dedd94df39b855be3..ee48720a7d6f2c7a6f571c64a0cb74b887413881 100644
--- a/drivers/srf02/srf02-ultrasonic-sensor.c
+++ b/drivers/srf02/srf02-ultrasonic-sensor.c
@@ -14,7 +14,6 @@
  *              The connection between the MCU and the SRF08 is based on the
  *              i2c-interface.
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  * @version     $Revision: 3856 $
  *
diff --git a/drivers/srf08/srf08-ultrasonic-sensor.c b/drivers/srf08/srf08-ultrasonic-sensor.c
index 5a6f71521c6f7f1c25147f11693c51451a1c6a88..3fa17090a164849e6fd67379a4fa539a142ac039 100644
--- a/drivers/srf08/srf08-ultrasonic-sensor.c
+++ b/drivers/srf08/srf08-ultrasonic-sensor.c
@@ -13,7 +13,6 @@
  * @internal
  * @brief       Driver for the SRF08 ultrasonic ranger using the i2c interface.
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  * @version     $Revision: 3857 $
  *
diff --git a/sys/bloom/bloom.c b/sys/bloom/bloom.c
index e8be005f63b553d100958334646cecc3ee30bb02..f3eb2d3730eaf7259f315041a8339e604bc656bc 100644
--- a/sys/bloom/bloom.c
+++ b/sys/bloom/bloom.c
@@ -10,7 +10,6 @@
  * @file
  * @author Jason Linehan <patientulysses@gmail.com>
  * @author Christian Mehlis <mehlis@inf.fu-berlin.de>
- * @author Freie Universität Berlin, Computer Systems & Telematics
  *
  */
 
diff --git a/sys/crypto/rc5.c b/sys/crypto/rc5.c
index bec7c7a86008bb1dd78eae2d5dd6c1ae2219ed19..bd9d0e8c96fe81964416e00aae44687103c4eb81 100644
--- a/sys/crypto/rc5.c
+++ b/sys/crypto/rc5.c
@@ -12,7 +12,6 @@
  * @file        rc5.c
  * @brief       implementation of the RC5 cipher-algorithm
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Nicolai Schmittberger <nicolai.schmittberger@fu-berlin.de>
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  * @author      Naveen Sastry
diff --git a/sys/hashes/hashes.c b/sys/hashes/hashes.c
index 093738bd398c8c382e1728b7d01a3bb0715e8f00..2b5107848778ecf9f5ab86e8f7af8d27198b614b 100644
--- a/sys/hashes/hashes.c
+++ b/sys/hashes/hashes.c
@@ -11,7 +11,6 @@
 /**
  * @file
  * @author      Jason Linehan <patientulysses@gmail.com>
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Christian Mehlis <mehlis@inf.fu-berlin.de>
  */
 
diff --git a/sys/include/bloom.h b/sys/include/bloom.h
index 61a67920d1ec9556686196aaf5121dfc5b6d96a4..2df6d457fa90d0e5b06a23e2a7037e0cad0cbb7c 100644
--- a/sys/include/bloom.h
+++ b/sys/include/bloom.h
@@ -110,7 +110,6 @@
  * @brief       Bloom filter API
  *
  * @author Christian Mehlis <mehlis@inf.fu-berlin.de>
- * @author Freie Universität Berlin, Computer Systems & Telematics
  */
 
 #ifndef _BLOOM_FILTER_H
diff --git a/sys/include/fd.h b/sys/include/fd.h
index 95da6eaa36d99948d47d4bb679c491859f2df9ee..bf7ea1a1828f8271b644f95532e8a0d3ceadbe15 100644
--- a/sys/include/fd.h
+++ b/sys/include/fd.h
@@ -15,7 +15,6 @@
  * @file    fd.h
  * @brief   Unifies diverse identifiers of RIOT to POSIX like file descriptors.
  *
- * @author  Freie Universität Berlin
  * @author  Martin Lenders <mlenders@inf.fu-berlin.de>
  * @author  Christian Mehlis <mehlis@inf.fu-berlin.de>
  */
diff --git a/sys/include/hashes.h b/sys/include/hashes.h
index 413dfde3bd76f8eece54ab1faac9bffe124386c6..357578ecf36037fceb18dc0b33395b42b1354f81 100644
--- a/sys/include/hashes.h
+++ b/sys/include/hashes.h
@@ -16,7 +16,6 @@
  * @brief       Hash function API
  *
  * @author      Jason Linehan <patientulysses@gmail.com>
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Christian Mehlis <mehlis@inf.fu-berlin.de>
  */
 
diff --git a/sys/include/posix_io.h b/sys/include/posix_io.h
index 3395c3f836e39415606ee4c8e9996086bd57942a..fb11a3a6705091b868851f53caca06589b66c14f 100644
--- a/sys/include/posix_io.h
+++ b/sys/include/posix_io.h
@@ -12,7 +12,6 @@
  * @file        posix_io.h
  * @brief       POSIX-like IO
  *
- * @author      Freie Universität Berlin
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  * @author      Stephan Zeisberg <zeisberg@mi.fu-berlin.de>
  * @author      Oliver Hahm <oleg@hobbykeller.org>
diff --git a/sys/include/radio/radio.h b/sys/include/radio/radio.h
index 66ed4d9ab73554db5d5703e4138ecc41f7451fc8..e604398bf9d70f47b530bc456e97ca228b11c8fb 100644
--- a/sys/include/radio/radio.h
+++ b/sys/include/radio/radio.h
@@ -26,7 +26,6 @@
  * @file
  * @brief
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		baar
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @version     $Revision: 1961 $
diff --git a/sys/include/radio/types.h b/sys/include/radio/types.h
index f40f142577ad761cd7b96163ad8452aaf34ffd88..1fb8ba221a32edcf8b04c322535bcbfe9db56654 100644
--- a/sys/include/radio/types.h
+++ b/sys/include/radio/types.h
@@ -17,7 +17,6 @@
  * @file
  * @brief		Common network stack types (of all layers).
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  * @version     $Revision: 2061 $
diff --git a/sys/net/include/net_if.h b/sys/net/include/net_if.h
index 3c03775b4d1bc68b838409e0a09138ff3d935cc7..46c9aab69782be379bba9be7247be92443f582c5 100644
--- a/sys/net/include/net_if.h
+++ b/sys/net/include/net_if.h
@@ -16,7 +16,6 @@
  *
  * @file        net_if.h
  * @brief       Types and functions for network interfaces
- * @author      Freie Universität Berlin
  * @author      Martin Lenders <mlenders@inf.fu-berlin.de>
  */
 #ifndef _NET_IF_H
diff --git a/sys/net/include/protocol-multiplex.h b/sys/net/include/protocol-multiplex.h
index 157d3004715f42b791e236865d830598035e0da2..f0a2e41449e6bbb4e030e2afe8fdac8099f0f32c 100644
--- a/sys/net/include/protocol-multiplex.h
+++ b/sys/net/include/protocol-multiplex.h
@@ -21,7 +21,6 @@
  * @file
  * @brief       Protocol handler multiplexing
  *
- * @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      Michael Baar <baar@inf.fu-berlin.de>
diff --git a/sys/net/link_layer/protocol-multiplex/protocol-multiplex.c b/sys/net/link_layer/protocol-multiplex/protocol-multiplex.c
index f83ed599f97357306d23f78b4ee1e527fab18621..b9721cfcf91ee39c9a99d286bdf4bc48472cac27 100644
--- a/sys/net/link_layer/protocol-multiplex/protocol-multiplex.c
+++ b/sys/net/link_layer/protocol-multiplex/protocol-multiplex.c
@@ -22,7 +22,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
  * @internal
  * @brief		Protocol handler multiplexing
  *
- * @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		Michael Baar <baar@inf.fu-berlin.de>
diff --git a/sys/posix/include/strings.h b/sys/posix/include/strings.h
index c1dc2095fdc99baa246ea9090cdf145aec2e37e4..ab008938917f529289476a13382782250244c24b 100644
--- a/sys/posix/include/strings.h
+++ b/sys/posix/include/strings.h
@@ -17,7 +17,6 @@
  *              The Open Group Base Specifications Issue 7, <strings.h>
  *          </a>
  *
- * @author  Freie Universität Berlin
  * @author  Martin Lenders <mlenders@inf.fu-berlin.de>
  */
 #ifndef STRINGS_H
diff --git a/sys/posix/include/unistd.h b/sys/posix/include/unistd.h
index 9deb4deb64de30af1d4a923fa0e9e1d812eee5ff..25b23ba799f20a781e3f7a9646f9aff1ee606298 100644
--- a/sys/posix/include/unistd.h
+++ b/sys/posix/include/unistd.h
@@ -18,7 +18,6 @@
  *              The Open Group Base Specifications Issue 7, <unistd.h>
  *          </a>
  *
- * @author  Freie Universität Berlin
  * @author  Martin Lenders <mlenders@inf.fu-berlin.de>
  */
 #ifndef _UNISTD_H
diff --git a/sys/posix/pnet/include/arpa/inet.h b/sys/posix/pnet/include/arpa/inet.h
index 192cecaccf819b0578fad6b31152eac000e497be..a1e441f89c87d9b7f2ff6f0622b1ed9701ff0d1c 100644
--- a/sys/posix/pnet/include/arpa/inet.h
+++ b/sys/posix/pnet/include/arpa/inet.h
@@ -18,7 +18,6 @@
  *              The Open Group Base Specifications Issue 7, <arpa/inet.h>
  *          </a>
  *
- * @author  Freie Universität Berlin
  * @author  Martin Lenders <mlenders@inf.fu-berlin.de>
  */
 #ifndef ARPA_INET_H
diff --git a/sys/posix/pnet/include/netinet/in.h b/sys/posix/pnet/include/netinet/in.h
index 2b928ab41145f2272decb4ab5101adc46a763c90..401253cd54092c4b5c2f7b0d43c866875ad15737 100644
--- a/sys/posix/pnet/include/netinet/in.h
+++ b/sys/posix/pnet/include/netinet/in.h
@@ -18,7 +18,6 @@
  *              The Open Group Base Specifications Issue 7, <netinet/in.h>
  *          </a>
  *
- * @author  Freie Universität Berlin
  * @author  Martin Lenders <mlenders@inf.fu-berlin.de>
  */
 #ifndef _NETINET_IN_H
diff --git a/sys/posix/pnet/include/sys/socket.h b/sys/posix/pnet/include/sys/socket.h
index 8ccaeecf30d7722f57ef570f8e80fbb32a3d922e..a71761e806b90d0cfcb63d8620514a680c036228 100644
--- a/sys/posix/pnet/include/sys/socket.h
+++ b/sys/posix/pnet/include/sys/socket.h
@@ -18,7 +18,6 @@
  *              The Open Group Base Specifications Issue 7, <sys/socket.h>
  *          </a>
  *
- * @author  Freie Universität Berlin
  * @author  Martin Lenders <mlenders@inf.fu-berlin.de>
  */
 #ifndef _SYS_SOCKET_H
diff --git a/sys/shell/commands/sc_heap.c b/sys/shell/commands/sc_heap.c
index ee6156159e22f328d02944d342265bda78698962..6816a1e2027157b1536cc4bc88682cb6728555b7 100644
--- a/sys/shell/commands/sc_heap.c
+++ b/sys/shell/commands/sc_heap.c
@@ -12,7 +12,6 @@
  * @internal
  * @brief   Show the heap state for the LPC2387 on the command shell.
  *
- * @author  Freie Universität Berlin, Computer Systems & Telematics
  * @author  Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  *
  * @note    $Id: sc_heap.c 3855 2013-09-05 12:40:11 kasmi $
diff --git a/sys/shell/shell.c b/sys/shell/shell.c
index 49e42818f381819551c4336dc88175499d1c2628..33c97a103b883233751fae6e37c6763e34ba8134 100644
--- a/sys/shell/shell.c
+++ b/sys/shell/shell.c
@@ -22,7 +22,6 @@
  *              name of a handler, the handler will be called with the whole
  *              command line as parameter.
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
diff --git a/tests/unittests/tests-core/tests-core.h b/tests/unittests/tests-core/tests-core.h
index 638b1cb2bed16e3eea4cef2f77069a94d878cafb..f5de0bb8bfd862d4af8a65cfbd1771964014047c 100644
--- a/tests/unittests/tests-core/tests-core.h
+++ b/tests/unittests/tests-core/tests-core.h
@@ -13,7 +13,6 @@
  * @file        tests-core.h
  * @brief       Unittests for the ``core`` module
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 #ifndef __TESTS_CORE_H_
diff --git a/tests/unittests/tests-lib/tests-lib.h b/tests/unittests/tests-lib/tests-lib.h
index 0644e49a42027741fa2aeec24f8aaeaee13c71de..18b69a1e3441b916badd75cdebe55be2fb856a7c 100644
--- a/tests/unittests/tests-lib/tests-lib.h
+++ b/tests/unittests/tests-lib/tests-lib.h
@@ -13,7 +13,6 @@
  * @file        tests-lib.h
  * @brief       Unittests for the ``lib`` sysmodule
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
 #ifndef __TESTS_CORE_H_
diff --git a/tests/unittests/unittests.h b/tests/unittests/unittests.h
index 5ca576fce6d73a328352e49acd4d43bea6f9cd00..97151cabcee3f1d0e4482a38000677355b145621 100644
--- a/tests/unittests/unittests.h
+++ b/tests/unittests/unittests.h
@@ -13,7 +13,6 @@
  * @file        unittests.h
  * @brief       Common header file for unittests
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */