diff --git a/doc/indices-and-tables.rst b/doc/indices-and-tables.rst
index bf62509bd1471d7b22b30da400e346307aae37b1..56b33139280a5038ac53d46e65eeab39a13899ac 100644
--- a/doc/indices-and-tables.rst
+++ b/doc/indices-and-tables.rst
@@ -1,6 +1,6 @@
 .. only:: html
 
-  Indexes and tables
+  Indices and tables
   ==================
 
   :ref:`genindex`
diff --git a/gcc/jit/doc/cp/index.rst b/gcc/jit/doc/cp/index.rst
index 46efb8a516f50f8c9d9e13f7fb284ef5d392b1b8..00263b6fe722c58813c9ad413d8f59140573eede 100644
--- a/gcc/jit/doc/cp/index.rst
+++ b/gcc/jit/doc/cp/index.rst
@@ -33,5 +33,5 @@ Contents:
 .. toctree::
    :maxdepth: 2
 
-   intro/index.rst
-   topics/index.rst
+   intro/index
+   topics/index
diff --git a/gcc/jit/doc/cp/intro/index.rst b/gcc/jit/doc/cp/intro/index.rst
index e6812101c6f600ee3fb80eb7d98c2701171beb9f..3a6a26c943e0917b3b88767f6d8dcad2e2d2989d 100644
--- a/gcc/jit/doc/cp/intro/index.rst
+++ b/gcc/jit/doc/cp/intro/index.rst
@@ -21,7 +21,7 @@ Tutorial
 .. toctree::
    :maxdepth: 2
 
-   tutorial01.rst
-   tutorial02.rst
-   tutorial03.rst
-   tutorial04.rst
+   tutorial01
+   tutorial02
+   tutorial03
+   tutorial04
diff --git a/gcc/jit/doc/cp/topics/index.rst b/gcc/jit/doc/cp/topics/index.rst
index cdf7e55a6c8ca056a3114553fe3cea9536d59f67..e659ece3fb1a6104202b6c0a3ca074cd133ff022 100644
--- a/gcc/jit/doc/cp/topics/index.rst
+++ b/gcc/jit/doc/cp/topics/index.rst
@@ -21,11 +21,11 @@ Topic Reference
 .. toctree::
    :maxdepth: 2
 
-   contexts.rst
-   objects.rst
-   types.rst
-   expressions.rst
-   functions.rst
-   locations.rst
-   compilation.rst
-   asm.rst
+   contexts
+   objects
+   types
+   expressions
+   functions
+   locations
+   compilation
+   asm
diff --git a/gcc/jit/doc/index.rst b/gcc/jit/doc/index.rst
index 0f575966303c0d4512df5be2f860d3bebe504c50..a354d1c1501edb784e5b8fa226ce7f054baa4ce0 100644
--- a/gcc/jit/doc/index.rst
+++ b/gcc/jit/doc/index.rst
@@ -33,14 +33,9 @@ Contents:
 .. toctree::
    :maxdepth: 2
 
-   intro/index.rst
-   topics/index.rst
-   cp/index.rst
-   internals/index.rst
+   intro/index
+   topics/index
+   cp/index
+   internals/index
 
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`search`
+   indices-and-tables
diff --git a/gcc/jit/doc/indices-and-tables.rst b/gcc/jit/doc/indices-and-tables.rst
new file mode 100644
index 0000000000000000000000000000000000000000..5cc3191ee479b7116afe1f3faa1ce2c83bbebcff
--- /dev/null
+++ b/gcc/jit/doc/indices-and-tables.rst
@@ -0,0 +1 @@
+.. include:: ../../../doc/indices-and-tables.rst
diff --git a/gcc/jit/doc/intro/index.rst b/gcc/jit/doc/intro/index.rst
index 552a6ed4417e41569fb3ef91fdb9667fbf10e271..20a813e7a96ed98c555d73719f034a7a9814e2e5 100644
--- a/gcc/jit/doc/intro/index.rst
+++ b/gcc/jit/doc/intro/index.rst
@@ -21,8 +21,8 @@ Tutorial
 .. toctree::
    :maxdepth: 2
 
-   tutorial01.rst
-   tutorial02.rst
-   tutorial03.rst
-   tutorial04.rst
-   tutorial05.rst
+   tutorial01
+   tutorial02
+   tutorial03
+   tutorial04
+   tutorial05
diff --git a/gcc/jit/doc/topics/index.rst b/gcc/jit/doc/topics/index.rst
index 8e843c207fcc7266f57e35fe6bc6a611f78a31c6..39462d9e8285e9f852b9dd6620c544874a7e6d86 100644
--- a/gcc/jit/doc/topics/index.rst
+++ b/gcc/jit/doc/topics/index.rst
@@ -21,14 +21,14 @@ Topic Reference
 .. toctree::
    :maxdepth: 2
 
-   contexts.rst
-   objects.rst
-   types.rst
-   expressions.rst
-   functions.rst
-   function-pointers.rst
-   locations.rst
-   compilation.rst
-   compatibility.rst
-   performance.rst
-   asm.rst
+   contexts
+   objects
+   types
+   expressions
+   functions
+   function-pointers
+   locations
+   compilation
+   compatibility
+   performance
+   asm