diff --git a/CMakeLists.txt b/CMakeLists.txt
index 260842c1..9b79776f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -443,6 +443,7 @@ function(add_doc_target)
     COMMAND
       ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/support
         ${MKDOCS} build -f ${CMAKE_CURRENT_SOURCE_DIR}/support/mkdocs.yml
+                        --no-directory-urls
     SOURCES ${sources})
 
   include(GNUInstallDirs)
diff --git a/support/mkdocs.yml b/support/mkdocs.yml
index 1ce06ac6..7ff2f8a7 100644
--- a/support/mkdocs.yml
+++ b/support/mkdocs.yml
@@ -4,9 +4,6 @@ docs_dir: ../doc
 
 repo_url: https://github.com/fmtlib/fmt
 
-# Make the docs work locally without a server.
-use_directory_urls: false
-
 theme:
   name: material
   features:
diff --git a/support/run-mkdocs b/support/run-mkdocs
index 3ad9cdb7..30d603a4 100755
--- a/support/run-mkdocs
+++ b/support/run-mkdocs
@@ -3,9 +3,12 @@
 
 import os, subprocess, sys
 
+dirname = os.path.dirname(__file__)
+
 # Set PYTHONPATH for the mkdocstrings handler.
 env = os.environ.copy()
 path = env.get('PYTHONPATH')
-env['PYTHONPATH'] = (path + ':' if path else '') + os.path.dirname(__file__)
+env['PYTHONPATH'] = (path + ':' if path else '') + dirname
 
-subprocess.run(['mkdocs'] + sys.argv[1:], env=env)
+config_path = os.path.join(dirname, 'mkdocs.yml')
+subprocess.run(['mkdocs'] + sys.argv[1:] + ['-f', config_path], env=env)