diff --git a/core/doc.txt b/core/doc.txt
index eba36071d8adff3d770335d685e467a84f5b40a0..e1406bda7a7082178a97c7808f2f03dd5ef081f7 100644
--- a/core/doc.txt
+++ b/core/doc.txt
@@ -25,3 +25,9 @@
  * @ingroup     core
  * @brief       Configuration data and startup code for the kernel
  */
+
+ /**
+  * @defgroup    core_sync Thread Synchronization
+  * @ingroup     core
+  * @brief       Thread synchronization mechanisms of the kernel
+  */
diff --git a/core/include/cond.h b/core/include/cond.h
index 38c14677a255aacf9797411def2c9470c45ccdd5..67520c7418c5d1a0daa7131c5854a6d954d30c45 100644
--- a/core/include/cond.h
+++ b/core/include/cond.h
@@ -5,12 +5,9 @@
  */
 
 /**
+ * @defgroup    core_sync_cond Condition Variable
+ * @ingroup     core_sync
  * @brief       Condition variable for thread synchronization
- * @ingroup     core, core_sync
- * @{
- *
- * @file
- * @brief       RIOT synchronization API
  *
  * This file contains a condition variable with Mesa-style semantics.
  *
@@ -129,6 +126,11 @@
  * Note that this could actually be written with a single condition variable.
  * However, the example includes two for didactic reasons.
  *
+ * @{
+ *
+ * @file
+ * @brief       Condition variable for thread synchronization
+ *
  * @author      Sam Kumar <samkumar@berkeley.edu>
  */
 
diff --git a/core/include/mutex.h b/core/include/mutex.h
index 9a29eb5f7e0ffdb0e817af44454a00302474e063..f41a5ae9bc65a5df9c13ebc0a588b2bfb984aff3 100644
--- a/core/include/mutex.h
+++ b/core/include/mutex.h
@@ -8,13 +8,13 @@
  */
 
 /**
- * @defgroup    core_sync Synchronization
+ * @defgroup    core_sync_mutex Mutex
+ * @ingroup     core_sync
  * @brief       Mutex for thread synchronization
- * @ingroup     core
  * @{
  *
  * @file
- * @brief       RIOT synchronization API
+ * @brief       Mutex for thread synchronization
  *
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
diff --git a/core/include/rmutex.h b/core/include/rmutex.h
index ef8c0692c624931fe2643f60fc794be38e87e944..77553fb4059198c164112ed75e6e941a07cbf7b9 100644
--- a/core/include/rmutex.h
+++ b/core/include/rmutex.h
@@ -7,12 +7,14 @@
  */
 
 /**
+ * @defgroup    core_sync_rmutex Recursive Mutex
  * @ingroup     core_sync
  * @brief       Recursive Mutex for thread synchronization
+ *
  * @{
  *
  * @file
- * @brief       RIOT synchronization API
+ * @brief       Recursive Mutex for thread synchronization
  *
  * @author      Martin Elshuber <martin.elshuber@theobroma-systems.com>
  *