diff --git a/Documentation/gpu/conf.py b/Documentation/gpu/conf.py
index d60bcd0db040ab287732e758d5a9840a4f8eeebe..6314d17082309549c330c1d943121e219132c0db 100644
--- a/Documentation/gpu/conf.py
+++ b/Documentation/gpu/conf.py
@@ -1,3 +1,5 @@
 # -*- coding: utf-8; mode: python -*-
 
 project = "Linux GPU Driver Developer's Guide"
+
+tags.add("subproject")
diff --git a/Documentation/gpu/index.rst b/Documentation/gpu/index.rst
index fcac0fa72056cc298ff949d7cf0d03f531485fe8..5ff3d2b236afa04c171375e9223def9d339d2db9 100644
--- a/Documentation/gpu/index.rst
+++ b/Documentation/gpu/index.rst
@@ -12,3 +12,10 @@ Linux GPU Driver Developer's Guide
    drm-uapi
    i915
    vga-switcheroo
+
+.. only::  subproject
+
+   Indices
+   =======
+
+   * :ref:`genindex`
diff --git a/Documentation/index.rst b/Documentation/index.rst
index bdd9525e05aa25e57b042c2f63d8e5bff0eddda9..a15f81855b39b1f270335feb5e7793bc4c86d827 100644
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@ -19,4 +19,3 @@ Indices and tables
 ==================
 
 * :ref:`genindex`
-* :ref:`search`
diff --git a/Documentation/media/conf.py b/Documentation/media/conf.py
index 62bdba23791796bf85922ddd8ec1ca73aa1fe0ad..77cb2bbd9461b9d77826142df32b58bd30fbaf4e 100644
--- a/Documentation/media/conf.py
+++ b/Documentation/media/conf.py
@@ -1,3 +1,5 @@
 # -*- coding: utf-8; mode: python -*-
 
 project = 'Linux Media Subsystem Documentation'
+
+tags.add("subproject")
diff --git a/Documentation/media/index.rst b/Documentation/media/index.rst
index e85c557eeea3cefc71ac09f93c45964d6bd33345..7f8f0af620ceb281416462b88e332491ddbdaa98 100644
--- a/Documentation/media/index.rst
+++ b/Documentation/media/index.rst
@@ -10,3 +10,10 @@ Contents:
    media_kapi
    dvb-drivers/index
    v4l-drivers/index
+
+.. only::  subproject
+
+   Indices
+   =======
+
+   * :ref:`genindex`