3 files changed, 17 insertions, 7 deletions
diff --git a/doc/sphinx/changes.rst b/doc/sphinx/changes.rst
index 6242833cda..0f2fce522a 100644
--- a/doc/sphinx/changes.rst
+++ b/doc/sphinx/changes.rst
@@ -980,8 +980,14 @@ Infrastructure and dependencies
 
 - **Changed:**
   Minimal versions of dependencies for building the reference manual:
-  now requires Sphinx 2.3.1+, sphinx_rtd_theme 0.4.3+ and
-  sphinxcontrib-bibtex 0.4.2+
+  now requires Sphinx >= 2.3.1 & < 3.0.0, sphinx_rtd_theme 0.4.3+ and
+  sphinxcontrib-bibtex 0.4.2+.
+
+  .. warning::
+
+     The reference manual is known not to build properly with
+     Sphinx 3.
+
   (`#12224 <https://github.com/coq/coq/pull/12224>`_,
   by Jim Fehrle and Théo Zimmermann).
 - **Removed:**
diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py
index fabf7a519f..99762c7a0e 100755
--- a/doc/sphinx/conf.py
+++ b/doc/sphinx/conf.py
@@ -214,11 +214,12 @@ html_context = {
     'conf_py_path': '/doc/sphinx/',
     # Versions and downloads listed in the versions menu (see _templates/versions.html)
     'versions': [
-        ("master", "https://coq.github.io/doc/master/refman/"),
+        ("dev", "https://coq.github.io/doc/master/refman/"),
         ("stable", "https://coq.inria.fr/distrib/current/refman/"),
-        ("v8.11", "https://coq.github.io/doc/v8.11/refman/"),
-        ("v8.10", "https://coq.github.io/doc/v8.10/refman/"),
-        ("v8.9", "https://coq.github.io/doc/v8.9/refman/"),
+        ("v8.12", "https://coq.github.io/doc/v8.12/refman/"),
+        ("8.11", "https://coq.inria.fr/distrib/V8.11.2/refman/"),
+        ("8.10", "https://coq.inria.fr/distrib/V8.10.2/refman/"),
+        ("8.9", "https://coq.inria.fr/distrib/V8.9.1/refman/"),
         ("8.8", "https://coq.inria.fr/distrib/V8.8.2/refman/"),
         ("8.7", "https://coq.inria.fr/distrib/V8.7.2/refman/"),
         ("8.6", "https://coq.inria.fr/distrib/V8.6.1/refman/"),
@@ -356,6 +357,9 @@ latex_elements = {
 
 latex_engine = "xelatex"
 
+# Cf. https://github.com/sphinx-doc/sphinx/issues/7015
+latex_use_xindy = False
+
 ########
 # done #
 ########
diff --git a/doc/sphinx/dune b/doc/sphinx/dune
index b788fbbeed..31f28635fe 100644
--- a/doc/sphinx/dune
+++ b/doc/sphinx/dune
@@ -1,4 +1,4 @@
-(dirs :standard _static)
+(dirs :standard _static _templates)
 
 (rule
  (targets README.gen.rst)