diff --git a/docs/index.rst b/docs/index.rst
index 9898bf57c2450588f0443dbbe05f6e3a055e82ec..8237bc84b5dd19b47157cc4548a7c1bf5227ac70 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -121,15 +121,9 @@ General
    modules
    contribute
    support
+   indices
 
 
-   
-Glossary
-========
-
-.. toctree::
-   :maxdepth: 1
-
 
 Indices and tables
 ==================
diff --git a/docs/indices.rst b/docs/indices.rst
new file mode 100644
index 0000000000000000000000000000000000000000..47168c868966e0dcadcc3687e71f9c9b89d1b242
--- /dev/null
+++ b/docs/indices.rst
@@ -0,0 +1,5 @@
+Indices and Tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`