diff --git a/Kconfig b/Kconfig
index ef71416c6c4..3896eb16f4c 100644
--- a/Kconfig
+++ b/Kconfig
@@ -105,6 +105,8 @@ config  COMPILER_OPT
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 config  EXPERIMENTAL
diff --git a/drivers/Kconfig b/drivers/Kconfig
index af44d6b2c25..3e6ac5b4e42 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -1,3 +1,5 @@
+source "drivers/bluetooth/Kconfig"
+
 config DRV_CONSOLE
 	bool
 	default y
@@ -47,5 +49,3 @@ config DRV_RANDOM
 	This option enables the random number generator driver.
 
 source "drivers/random/Kconfig"
-
-source "drivers/bluetooth/Kconfig"
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index e547b503f77..737c00e3583 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -33,23 +33,8 @@
 #
 # Bluetooth options
 #
-menu "Bluetooth Options"
-
-config	BLUETOOTH
-	bool
-	prompt "Bluetooth LE support [EXPERIMENTAL]"
-	default n
-	help
-	  This option enables Bluetooth Low Energy support.
-
-config	BLUETOOTH_DEBUG
-	bool
-	prompt "Bluetooth LE debug support"
-	depends on BLUETOOTH
-	default n
-	help
-	  This option enables Bluetooth debug going to standard
-	  serial console.
+menu "Bluetooth Stack Options"
+depends on BLUETOOTH
 
 config	BLUETOOTH_DEBUG_UART
 	bool
@@ -60,15 +45,6 @@ config	BLUETOOTH_DEBUG_UART
 	  This option enables debug support for Bluetooth UART
 	  driver
 
-config	BLUETOOTH_DEBUG_HCI_CORE
-	bool
-	prompt "Bluetooth HCI core debug"
-	depends on BLUETOOTH_DEBUG
-	default n
-	help
-	  This option enables debug support for Bluetooth HCI
-	  core
-
 config	BLUETOOTH_UART
 	bool
 	prompt "Bluetooth UART driver"
diff --git a/net/Kconfig b/net/Kconfig
new file mode 100644
index 00000000000..b024411ecf6
--- /dev/null
+++ b/net/Kconfig
@@ -0,0 +1 @@
+source "net/bluetooth/Kconfig"
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
new file mode 100644
index 00000000000..af1f3cc219a
--- /dev/null
+++ b/net/bluetooth/Kconfig
@@ -0,0 +1,24 @@
+config	BLUETOOTH
+	bool
+	prompt "Bluetooth LE support [EXPERIMENTAL]"
+	default n
+	help
+	  This option enables Bluetooth Low Energy support.
+
+config	BLUETOOTH_DEBUG
+	bool
+	prompt "Bluetooth LE debug support"
+	depends on BLUETOOTH
+	default n
+	help
+	  This option enables Bluetooth debug going to standard
+	  serial console.
+
+config	BLUETOOTH_DEBUG_HCI_CORE
+	bool
+	prompt "Bluetooth HCI core debug"
+	depends on BLUETOOTH_DEBUG
+	default n
+	help
+	  This option enables debug support for Bluetooth HCI
+	  core