diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel
index 52ba2aa699a..dce21aaa15c 100644
--- a/bazel_common/score_modules_target_sw.MODULE.bazel
+++ b/bazel_common/score_modules_target_sw.MODULE.bazel
@@ -23,7 +23,7 @@ git_override(
         "//patches/baselibs:001-restore-trace-library-mock-visibility.patch",
         "//patches/baselibs:002-restore-qnx8-poll-workaround.patch",
         "//patches/baselibs:005-rename-manual-verification-report-id.patch",
-        "//patches/baselibs:006-include-cpp-style-guide-in-toctree.patch",
+        "//patches/baselibs:006-exclude-cpp-style-guide-from-docs-mount.patch",
     ],
     remote = "https://github.com/eclipse-score/baselibs.git",
 )
diff --git a/known_good.json b/known_good.json
index 8024415c01a..340d806d2fb 100644
--- a/known_good.json
+++ b/known_good.json
@@ -7,7 +7,7 @@
                     "//patches/baselibs:001-restore-trace-library-mock-visibility.patch",
                     "//patches/baselibs:002-restore-qnx8-poll-workaround.patch",
                     "//patches/baselibs:005-rename-manual-verification-report-id.patch",
-                    "//patches/baselibs:006-include-cpp-style-guide-in-toctree.patch"
+                    "//patches/baselibs:006-exclude-cpp-style-guide-from-docs-mount.patch"
                 ],
                 "metadata": {
                     "code_root_path": "//score/...",
diff --git a/patches/baselibs/006-exclude-cpp-style-guide-from-docs-mount.patch b/patches/baselibs/006-exclude-cpp-style-guide-from-docs-mount.patch
new file mode 100644
index 00000000000..bc3ff1019bd
--- /dev/null
+++ b/patches/baselibs/006-exclude-cpp-style-guide-from-docs-mount.patch
@@ -0,0 +1,12 @@
+diff --git a/docs/.ignore b/docs/.ignore
+new file mode 100644
+--- /dev/null
++++ b/docs/.ignore
+@@ -0,0 +1,7 @@
++# reference_integration mounts this directory into its aggregated docs
++# build via sphinx_mounts, which walks it independently of Sphinx's own
++# exclude_patterns. baselibs' own docs/conf.py already excludes this file
++# from baselibs' native docs build; mirror that here so it stays excluded
++# from the aggregated build too, instead of only being reachable through a
++# toctree link added solely for reference_integration's benefit.
++cpp-style-guide.md
diff --git a/patches/baselibs/006-include-cpp-style-guide-in-toctree.patch b/patches/baselibs/006-include-cpp-style-guide-in-toctree.patch
deleted file mode 100644
index bc916546678..00000000000
--- a/patches/baselibs/006-include-cpp-style-guide-in-toctree.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/docs/index.rst b/docs/index.rst
-index c2f4a6ef1..c4b8a57c1 100644
---- a/docs/index.rst
-+++ b/docs/index.rst
-@@ -56,6 +56,15 @@ The Components documentation provides detailed documentation for each individual
-    baselibs/components/index
- 
- 
-+Development Guidelines
-+-----------------------
-+
-+.. toctree::
-+   :maxdepth: 1
-+
-+   cpp-style-guide
-+
-+
- Quick Start - Building and Testing
- ----------------------------------
-