diff --git a/doc/source/conf.py b/doc/source/conf.py
index cdee9459a8b3..471b45325244 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -84,7 +84,8 @@
     "theme_vcs_pageview_mode": "edit",
     "github_user": "OSGeo",
     "github_repo": "gdal",
-    "github_version": "master/doc/source/",
+    "github_version": "master",
+    "conf_py_path": "/doc/source/",
 }
 
 html_theme_options = {