diff --git a/qtcreator.pro b/qtcreator.pro
index bd868bd38b32e39c2236834c9f39a8dc2294b804..532053369d0929904c663a4c6b9407c015b4080c 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -31,6 +31,11 @@ exists(src/shared/qbs/qbs.pro) {
     system("echo QBS_DLLDESTDIR = $${IDE_BUILD_TREE}/bin >> $$qmake_cache")
     system("echo QBS_DESTDIR = $${maybe_backslash}\"$${IDE_LIBRARY_PATH}$${maybe_backslash}\" >> $$qmake_cache")
     system("echo QBSLIBDIR = $${maybe_backslash}\"$${IDE_LIBRARY_PATH}$${maybe_backslash}\" >> $$qmake_cache")
+    system("echo QBS_INSTALL_PREFIX = $${QTC_PREFIX} >> $$qmake_cache")
+    system("echo QBS_LIB_INSTALL_DIR = $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator >> $$qmake_cache")
+    system("echo QBS_RESOURCES_BUILD_DIR = $${maybe_backslash}\"$${IDE_DATA_PATH}/qbs$${maybe_backslash}\" >> $$qmake_cache")
+    system("echo QBS_RESOURCES_INSTALL_DIR = $${QTC_PREFIX}/share/qtcreator/qbs >> $$qmake_cache")
+    system("echo CONFIG += qbs_no_dev_install >> $$qmake_cache")
 }
 
 contains(QT_ARCH, i386): ARCHITECTURE = x86
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 2cc9d996274176ed6b913d0cecf1c209be10fa95..165b9be528be33e5955ee72b757353dd9e262a41 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -568,7 +568,7 @@ QString QbsProject::qbsBuildDir() const
     QString buildDir = Utils::Environment::systemEnvironment()
             .value(QLatin1String("QBS_BUILD_DIR"));
     if (buildDir.isEmpty())
-        buildDir = QLatin1String(QBS_BUILD_DIR);
+        buildDir = Core::ICore::resourcePath() + QLatin1String("/qbs");
     return buildDir;
 }
 
diff --git a/src/shared/qbs b/src/shared/qbs
index 652982c7b5cb1138d5d339870bad0bbbb1f1c1e0..dcfc06010eb622adc4e90b8d77e5db25aa6219d9 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit 652982c7b5cb1138d5d339870bad0bbbb1f1c1e0
+Subproject commit dcfc06010eb622adc4e90b8d77e5db25aa6219d9