diff --git a/README.md b/README.md
index 0e63faee542..7306a91cb6a 100644
--- a/README.md
+++ b/README.md
@@ -138,7 +138,7 @@ For detailed information on the supported compilers, see
          the location of libclang.dll/.so that you want to be used.
          See more info in the section "Prebuilt LLVM/Clang packages".
        * When you launch Qt Creator, activate the Clang Code Model plugin as
-         described in doc/src/editors/creator-clang-codemodel.qdoc.
+         described in doc/src/editors/creator-only/creator-clang-codemodel.qdoc.
 
    11. You are now ready to configure and build Qt and Qt Creator.
        Please see <https://wiki.qt.io/Building_Qt_5_from_Git> for
diff --git a/qbs/modules/libclang/libclang.qbs b/qbs/modules/libclang/libclang.qbs
index b13ba888ffd..435b8b786a2 100644
--- a/qbs/modules/libclang/libclang.qbs
+++ b/qbs/modules/libclang/libclang.qbs
@@ -61,7 +61,8 @@ Module {
         if (!clangProbe.found) {
             console.warn("No usable libclang version found."
                          + " Set LLVM_INSTALL_DIR to build the Clang Code Model."
-                         + " For details, see doc/src/editors/creator-clang-codemodel.qdoc.");
+                         + " For details, see"
+                         + " doc/src/editors/creator-only/creator-clang-codemodel.qdoc.");
             throw new Error();
         }
     }
diff --git a/src/plugins/clangcodemodel/README b/src/plugins/clangcodemodel/README
index 84e2a30d8e0..334c70580ae 100644
--- a/src/plugins/clangcodemodel/README
+++ b/src/plugins/clangcodemodel/README
@@ -1 +1 @@
-See ../../../doc/src/editors/creator-clang-codemodel.qdoc
+See ../../../doc/src/editors/creator-only/creator-clang-codemodel.qdoc
diff --git a/src/plugins/clangcodemodel/clangcodemodel.pro b/src/plugins/clangcodemodel/clangcodemodel.pro
index fd64057effe..aba8a8ee7f3 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.pro
+++ b/src/plugins/clangcodemodel/clangcodemodel.pro
@@ -85,7 +85,7 @@ FORMS += clangprojectsettingswidget.ui
 
 DISTFILES += \
     README \
-    $${IDE_SOURCE_TREE}/doc/src/editors/creator-clang-codemodel.qdoc
+    $${IDE_SOURCE_TREE}/doc/src/editors/creator-only/creator-clang-codemodel.qdoc
 
 equals(TEST, 1) {
     HEADERS += \
diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs
index 20e0cb269d8..fe4721c81e7 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.qbs
+++ b/src/plugins/clangcodemodel/clangcodemodel.qbs
@@ -126,7 +126,7 @@ QtcPlugin {
         fileTags: []
         files: [
             "README",
-            project.ide_source_tree + "/doc/src/editors/creator-clang-codemodel.qdoc",
+            project.ide_source_tree + "/doc/src/editors/creator-only/creator-clang-codemodel.qdoc",
         ]
     }
 }