diff --git a/core/include/io.h b/core/include/io.h
index 97e0f3989..d85f93a1f 100644
--- a/core/include/io.h
+++ b/core/include/io.h
@@ -15,7 +15,6 @@
  * @file        io.h
  * @brief       Prototypes for system io functions
  *
- * @author      INRIA
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
 
diff --git a/core/include/kernel_internal.h b/core/include/kernel_internal.h
index 7080884f2..9015a70e2 100644
--- a/core/include/kernel_internal.h
+++ b/core/include/kernel_internal.h
@@ -13,7 +13,6 @@
  * @file        kernel_internal.h
  * @brief       prototypes for kernel internal functions
  *
- * @author      INRIA
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
 
diff --git a/cpu/mc1322x/include/cpu-conf.h b/cpu/mc1322x/include/cpu-conf.h
index 60ee83aae..1b851d944 100644
--- a/cpu/mc1322x/include/cpu-conf.h
+++ b/cpu/mc1322x/include/cpu-conf.h
@@ -22,7 +22,7 @@
  * @file
  * @brief		MC1322X CPUconfiguration
  *
- * @author		Oleg Hahm
+ * @author		Oliver Hahm <oliver.hahm@inria.fr>
  */
 
 /**
diff --git a/drivers/cc110x_ng/cc110x-defaultSettings.c b/drivers/cc110x_ng/cc110x-defaultSettings.c
index 38f65fcf8..0e6ffc4cd 100644
--- a/drivers/cc110x_ng/cc110x-defaultSettings.c
+++ b/drivers/cc110x_ng/cc110x-defaultSettings.c
@@ -13,10 +13,9 @@
  * @file
  * @brief   TI Chipcon CC110x default settings
  *
- * @author      INRIA
  * @author    Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author    Heiko Will <hwill@inf.fu-berlin.de>
- * @author      Oliver Hahm <oliver.hahm@inria.fr>
+ * @author    Oliver Hahm <oliver.hahm@inria.fr>
  * @}
  */
 
diff --git a/drivers/include/cc110x_ng/cc110x-reg.h b/drivers/include/cc110x_ng/cc110x-reg.h
index 2e0ea37f1..f1370f249 100644
--- a/drivers/include/cc110x_ng/cc110x-reg.h
+++ b/drivers/include/cc110x_ng/cc110x-reg.h
@@ -14,7 +14,6 @@
  * @file        cc110x-reg.h
  * @brief       Access to CC110X registers
  *
- * @author      INRIA
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */