diff --git a/CHANGES.rst b/CHANGES.rst
index d3ece6866..7650bf622 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -37,6 +37,9 @@ Translations
 
 Fixes
 -----
+* `make install-man` was updated to support Sphinx 4.0.
+  (`#1141 <https://github.com/git-cola/git-cola/issues/1141>`_)
+
 * `git cola --help-commands` was updated for newer versions of argparse.
   (`#1133 <https://github.com/git-cola/git-cola/issues/1133>`_)
 
diff --git a/share/doc/git-cola/conf.py b/share/doc/git-cola/conf.py
index f3caca714..ac5be2ee6 100644
--- a/share/doc/git-cola/conf.py
+++ b/share/doc/git-cola/conf.py
@@ -59,6 +59,10 @@
     ('git-dag', 'git-dag', 'The sleek and powerful Git history browser', authors, '1'),
 ]
 
+# Sphinx 4.0 creates sub-directories for each man section.
+# Disable this feature for consistency across Sphinx versions.
+man_make_section_directory = False
+
 latex_documents = [
     (
         'index',