diff --git a/Documentation/admin-guide/index.rst b/Documentation/admin-guide/index.rst
index 24fbe0568eff6c8f903354098b240fca0e97e211..8853c95ef0d4e378882a126362f16e53a48dfda3 100644
--- a/Documentation/admin-guide/index.rst
+++ b/Documentation/admin-guide/index.rst
@@ -61,6 +61,7 @@ configure specific aspects of kernel behavior to your liking.
    parport
    md
    module-signing
+   rapidio
    sysrq
    unicode
    vga-softcursor
diff --git a/Documentation/driver-api/rapidio.rst b/Documentation/admin-guide/rapidio.rst
similarity index 100%
rename from Documentation/driver-api/rapidio.rst
rename to Documentation/admin-guide/rapidio.rst
diff --git a/Documentation/driver-api/index.rst b/Documentation/driver-api/index.rst
index 6cd750a03ea0fb9e3e2d45cae167b02e22776d85..d665cd9ab95f3756567cfc24ad60bb8994c58ab1 100644
--- a/Documentation/driver-api/index.rst
+++ b/Documentation/driver-api/index.rst
@@ -45,7 +45,7 @@ available subsections can be seen below.
    miscellaneous
    mei/index
    w1
-   rapidio
+   rapidio/index
    s390-drivers
    vme
    80211/index
diff --git a/Documentation/rapidio/index.rst b/Documentation/driver-api/rapidio/index.rst
similarity index 94%
rename from Documentation/rapidio/index.rst
rename to Documentation/driver-api/rapidio/index.rst
index ab7b5541b346cf94e225b5f20fb2e64c97a40155..4c5e51a051344bccaba9d586ed0ffd8111c70775 100644
--- a/Documentation/rapidio/index.rst
+++ b/Documentation/driver-api/rapidio/index.rst
@@ -1,5 +1,3 @@
-:orphan:
-
 ===========================
 The Linux RapidIO Subsystem
 ===========================
diff --git a/Documentation/rapidio/mport_cdev.rst b/Documentation/driver-api/rapidio/mport_cdev.rst
similarity index 100%
rename from Documentation/rapidio/mport_cdev.rst
rename to Documentation/driver-api/rapidio/mport_cdev.rst
diff --git a/Documentation/rapidio/rapidio.rst b/Documentation/driver-api/rapidio/rapidio.rst
similarity index 100%
rename from Documentation/rapidio/rapidio.rst
rename to Documentation/driver-api/rapidio/rapidio.rst
diff --git a/Documentation/rapidio/rio_cm.rst b/Documentation/driver-api/rapidio/rio_cm.rst
similarity index 100%
rename from Documentation/rapidio/rio_cm.rst
rename to Documentation/driver-api/rapidio/rio_cm.rst
diff --git a/Documentation/rapidio/sysfs.rst b/Documentation/driver-api/rapidio/sysfs.rst
similarity index 100%
rename from Documentation/rapidio/sysfs.rst
rename to Documentation/driver-api/rapidio/sysfs.rst
diff --git a/Documentation/rapidio/tsi721.rst b/Documentation/driver-api/rapidio/tsi721.rst
similarity index 100%
rename from Documentation/rapidio/tsi721.rst
rename to Documentation/driver-api/rapidio/tsi721.rst
diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig
index 467e8fa06904698b0d58ce7c1766b7ac749393e4..677d1aff61b7f38889bff0caefd3ae8a4578ee05 100644
--- a/drivers/rapidio/Kconfig
+++ b/drivers/rapidio/Kconfig
@@ -86,7 +86,7 @@ config RAPIDIO_CHMAN
 	  This option includes RapidIO channelized messaging driver which
 	  provides socket-like interface to allow sharing of single RapidIO
 	  messaging mailbox between multiple user-space applications.
-	  See "Documentation/rapidio/rio_cm.rst" for driver description.
+	  See "Documentation/driver-api/rapidio/rio_cm.rst" for driver description.
 
 config RAPIDIO_MPORT_CDEV
 	tristate "RapidIO /dev mport device driver"