diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
index 17de5986..1fcc3925 100644
--- a/.github/workflows/doc.yml
+++ b/.github/workflows/doc.yml
@@ -33,6 +33,6 @@ jobs:
       env:
         KEY: ${{secrets.KEY}}
       run: |
-        cmake .
+        cmake $GITHUB_WORKSPACE
         make doc
         # $GITHUB_WORKSPACE/support/build-docs.py
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 541af4ba..6c0bfc9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -449,7 +449,8 @@ function(add_doc_target)
   add_custom_target(
     doc
     COMMAND
-      ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/support
+      ${CMAKE_COMMAND}
+        -E env PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/support/python
         ${MKDOCS} build -f ${CMAKE_CURRENT_SOURCE_DIR}/support/mkdocs.yml
                         --site-dir ${CMAKE_CURRENT_BINARY_DIR}/site
                         --no-directory-urls
diff --git a/support/run-mkdocs b/support/mkdocs
similarity index 64%
rename from support/run-mkdocs
rename to support/mkdocs
index 30d603a4..037f4246 100755
--- a/support/run-mkdocs
+++ b/support/mkdocs
@@ -3,7 +3,7 @@
 
 import os, subprocess, sys
 
-dirname = os.path.dirname(__file__)
+dirname = os.path.join(os.path.dirname(__file__), 'python')
 
 # Set PYTHONPATH for the mkdocstrings handler.
 env = os.environ.copy()
@@ -11,4 +11,7 @@ path = env.get('PYTHONPATH')
 env['PYTHONPATH'] = (path + ':' if path else '') + dirname
 
 config_path = os.path.join(dirname, 'mkdocs.yml')
-subprocess.run(['mkdocs'] + sys.argv[1:] + ['-f', config_path], env=env)
+args = sys.argv[1:]
+if 'build' in args:
+    args += ['-f', config_path]
+subprocess.run(['mkdocs'] + args, env=env)
diff --git a/support/mkdocstrings_handlers/cxx/__init__.py b/support/python/mkdocstrings_handlers/cxx/__init__.py
similarity index 100%
rename from support/mkdocstrings_handlers/cxx/__init__.py
rename to support/python/mkdocstrings_handlers/cxx/__init__.py
diff --git a/support/mkdocstrings_handlers/cxx/templates/README b/support/python/mkdocstrings_handlers/cxx/templates/README
similarity index 100%
rename from support/mkdocstrings_handlers/cxx/templates/README
rename to support/python/mkdocstrings_handlers/cxx/templates/README