diff --git a/Documentation/applications/index.rst b/Documentation/applications/index.rst
index 87d0367f91a..2a7a06d2672 100644
--- a/Documentation/applications/index.rst
+++ b/Documentation/applications/index.rst
@@ -36,6 +36,5 @@ more information at the repository.
    testing/index.rst
    wireless/index.rst
 
-   nxdiag/index.rst
    examples/index.rst
 
diff --git a/Documentation/applications/system/index.rst b/Documentation/applications/system/index.rst
index 983c1e9c27d..e554a1c2e10 100644
--- a/Documentation/applications/system/index.rst
+++ b/Documentation/applications/system/index.rst
@@ -1,3 +1,10 @@
 ================================
 System Libraries and NSH Add-Ons
 ================================
+
+.. toctree::
+   :glob:
+   :maxdepth: 3
+   :titlesonly:
+   
+   nxdiag/index.rst
diff --git a/Documentation/applications/nxdiag/config.rst b/Documentation/applications/system/nxdiag/config.rst
similarity index 100%
rename from Documentation/applications/nxdiag/config.rst
rename to Documentation/applications/system/nxdiag/config.rst
diff --git a/Documentation/applications/nxdiag/index.rst b/Documentation/applications/system/nxdiag/index.rst
similarity index 100%
rename from Documentation/applications/nxdiag/index.rst
rename to Documentation/applications/system/nxdiag/index.rst