diff --git a/pkg/nimble/contrib/include/nimble_riot.h b/pkg/nimble/contrib/include/nimble_riot.h
index 79db858ea2..628ff0c029 100644
--- a/pkg/nimble/contrib/include/nimble_riot.h
+++ b/pkg/nimble/contrib/include/nimble_riot.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     pkg_nimble
+ * @ingroup     ble_nimble
  * @{
  *
  * @file
diff --git a/pkg/nimble/contrib/nimble_riot.c b/pkg/nimble/contrib/nimble_riot.c
index 20fe26c752..554d020438 100644
--- a/pkg/nimble/contrib/nimble_riot.c
+++ b/pkg/nimble/contrib/nimble_riot.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     pkg_nimble
+ * @ingroup     ble_nimble
  * @{
  *
  * @file
diff --git a/pkg/nimble/doc.txt b/pkg/nimble/doc.txt
index 91696291b5..cca6c7e697 100644
--- a/pkg/nimble/doc.txt
+++ b/pkg/nimble/doc.txt
@@ -1,10 +1,10 @@
 /**
- * @defgroup pkg_nimble     NimBLE BLE stack
+ * @defgroup ble_nimble NimBLE
  * @ingroup  pkg
- * @ingroup  net
+ * @ingroup  ble
  * @brief    RIOT port of the NimBLE BLE stack
  *
- * This package includes the NimBLE BLE stack to RIOT.
+ * This package includes the RIOT port of the NimBLE BLE stack.
  *
  * @see https://github.com/apache/mynewt-nimble
  */
diff --git a/sys/include/net/ble.h b/sys/include/net/ble.h
index c72c4e5be7..aa3099dc53 100644
--- a/sys/include/net/ble.h
+++ b/sys/include/net/ble.h
@@ -7,8 +7,8 @@
  */
 
 /**
- * @defgroup    net_ble BLE defines
- * @ingroup     net
+ * @defgroup    ble_defs Generic BLE defines
+ * @ingroup     ble
  * @brief       General values defined by the BT standard
  * @{
  *
diff --git a/sys/include/net/bluetil/ad.h b/sys/include/net/bluetil/ad.h
index 59ba6379bd..c179de79cd 100644
--- a/sys/include/net/bluetil/ad.h
+++ b/sys/include/net/bluetil/ad.h
@@ -7,8 +7,8 @@
  */
 
 /**
- * @defgroup    net_bluetil_ad BLE Advertising Data (AD) Processing
- * @ingroup     net
+ * @defgroup    ble_bluetil_ad BLE Advertising Data (AD) Processing
+ * @ingroup     ble_bluetil
  * @brief       Generic BLE advertising and scan request data processing
  *
  * This module provides functionality for user friendly reading and writing of
diff --git a/sys/net/ble/bluetil/bluetil_ad/bluetil_ad.c b/sys/net/ble/bluetil/bluetil_ad/bluetil_ad.c
index f07a955166..e1e501ed00 100644
--- a/sys/net/ble/bluetil/bluetil_ad/bluetil_ad.c
+++ b/sys/net/ble/bluetil/bluetil_ad/bluetil_ad.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     net_bluetil_ad
+ * @ingroup     ble_bluetil_ad
  * @{
  *
  * @file
diff --git a/sys/net/ble/bluetil/doc.txt b/sys/net/ble/bluetil/doc.txt
new file mode 100644
index 0000000000..ec1afaf48a
--- /dev/null
+++ b/sys/net/ble/bluetil/doc.txt
@@ -0,0 +1,7 @@
+/**
+@defgroup    ble_bluetil Bluetil
+@ingroup     ble
+@brief       Collection of generic BLE utility modules
+
+
+*/
diff --git a/sys/net/ble/doc.txt b/sys/net/ble/doc.txt
new file mode 100644
index 0000000000..9663e80377
--- /dev/null
+++ b/sys/net/ble/doc.txt
@@ -0,0 +1,5 @@
+/**
+@defgroup    ble Bluetooth Low Energy (BLE)
+@ingroup     net
+@brief       Bluetooth Low Energy (BLE) support for RIOT
+*/