diff --git a/doc/doc.qbs b/doc/doc.qbs
index 5bea78d0dc9..2c4a4dc7e14 100644
--- a/doc/doc.qbs
+++ b/doc/doc.qbs
@@ -7,7 +7,7 @@ Project {
     QtcDocumentation {
         name: "user doc online"
         isOnlineDoc: true
-        mainDocConfFile: "qtcreator-online.qdocconf"
+        mainDocConfFile: "qtcreator/qtcreator-online.qdocconf"
 
         files: [
             "src/**/*",
@@ -17,7 +17,7 @@ Project {
     QtcDocumentation {
         name: "user doc offline"
         isOnlineDoc: false
-        mainDocConfFile: "qtcreator.qdocconf"
+        mainDocConfFile: "qtcreator/qtcreator.qdocconf"
 
         files: [
             "src/**/*",
@@ -27,7 +27,7 @@ Project {
     QtcDocumentation {
         name: "API doc online"
         isOnlineDoc: true
-        mainDocConfFile: "api/qtcreator-dev-online.qdocconf"
+        mainDocConfFile: "qtcreatordev/qtcreator-dev-online.qdocconf"
 
         Group {
             name: "sources"
@@ -42,7 +42,7 @@ Project {
     QtcDocumentation {
         name: "API doc offline"
         isOnlineDoc: false
-        mainDocConfFile: "api/qtcreator-dev.qdocconf"
+        mainDocConfFile: "qtcreatordev/qtcreator-dev.qdocconf"
 
         Group {
             name: "sources"
diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs
index fe4721c81e7..dc9d9fb7574 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-only/creator-clang-codemodel.qdoc",
+            project.ide_source_tree + "/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc",
         ]
     }
 }
diff --git a/src/plugins/clangtools/clangtools.qbs b/src/plugins/clangtools/clangtools.qbs
index 16d9455eb4f..d25707c562d 100644
--- a/src/plugins/clangtools/clangtools.qbs
+++ b/src/plugins/clangtools/clangtools.qbs
@@ -106,7 +106,7 @@ QtcPlugin {
         name: "Other files"
         fileTags: []
         files: [
-            project.ide_source_tree + "/doc/src/analyze/creator-clang-static-analyzer.qdoc",
+            project.ide_source_tree + "/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc",
         ]
     }
 }