diff --git a/doc/drivers/drivers.rst b/doc/devices/drivers/drivers.rst
similarity index 100%
rename from doc/drivers/drivers.rst
rename to doc/devices/drivers/drivers.rst
diff --git a/doc/dts/device_tree.rst b/doc/devices/dts/device_tree.rst
similarity index 100%
rename from doc/dts/device_tree.rst
rename to doc/devices/dts/device_tree.rst
diff --git a/doc/devices/index.rst b/doc/devices/index.rst
new file mode 100644
index 0000000..05c363a
--- /dev/null
+++ b/doc/devices/index.rst
@@ -0,0 +1,10 @@
+.. _devices:
+
+Device and Driver Support
+#########################
+
+.. toctree::
+   :maxdepth: 2
+
+   drivers/drivers.rst
+   dts/device_tree.rst
diff --git a/doc/index.rst b/doc/index.rst
index 59de277..56b16bc 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -36,18 +36,17 @@
 
    introduction/introducing_zephyr.rst
    getting_started/getting_started.rst
-   boards/boards.rst
+   contribute/contribute.rst
    kernel/kernel.rst
+   boards/boards.rst
    application/application.rst
+   samples/samples.rst
    porting/porting.rst
-   drivers/drivers.rst
-   dts/device_tree.rst
+   devices/index.rst
    subsystems/subsystems.rst
    api/api.rst
-   samples/samples.rst
    reference/kconfig/index.rst
    security/security.rst
-   contribute/contribute.rst
    release-notes.rst
    LICENSING.rst
    glossary.rst