diff --git a/qtcreator.pro b/qtcreator.pro
index 229d97e856d..702b46ae18b 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -54,6 +54,8 @@ exists(src/shared/qbs/qbs.pro) {
     system("echo QBS_LIBRARY_DIRNAME = $${IDE_LIBRARY_BASENAME} >> $$qmake_cache")
     system("echo QBS_APPS_DESTDIR = $${maybe_backslash}\"$${IDE_BIN_PATH}$${maybe_backslash}\">> $$qmake_cache")
     system("echo QBS_APPS_INSTALL_DIR = $${QTC_PREFIX}/bin >> $$qmake_cache")
+    system("echo QBS_RELATIVE_PLUGINS_PATH = $${maybe_backslash}\$$${maybe_backslash}\$relative_path$${maybe_backslash}\($${maybe_backslash}\$$${maybe_backslash}\$QBS_PLUGINS_BUILD_DIR, $${maybe_backslash}\$$${maybe_backslash}\$QBS_APPS_DESTDIR$${maybe_backslash}\)" >> $$qmake_cache)
+    system("echo QBS_RELATIVE_SEARCH_PATH = $${maybe_backslash}\$$${maybe_backslash}\$relative_path$${maybe_backslash}\($${maybe_backslash}\$$${maybe_backslash}\$QBS_RESOURCES_BUILD_DIR, $${maybe_backslash}\$$${maybe_backslash}\$QBS_APPS_DESTDIR$${maybe_backslash}\)" >> $$qmake_cache)
     system("echo CONFIG += qbs_no_dev_install >> $$qmake_cache")
 }
 
diff --git a/src/shared/qbs b/src/shared/qbs
index 6d72bca8f84..a68470880a0 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit 6d72bca8f84ff2b9a83a34a361acc3a4d510ad74
+Subproject commit a68470880a0195f7a52caad46b442df694cb26b0
diff --git a/src/src.qbs b/src/src.qbs
index f91f90212e7..387b13acd8c 100644
--- a/src/src.qbs
+++ b/src/src.qbs
@@ -1,5 +1,6 @@
 import qbs
 import qbs.File
+import qbs.FileInfo
 
 Project {
     name: "Sources"
@@ -29,6 +30,9 @@ Project {
         property string resourcesInstallDir: project.ide_data_path + "/qbs"
         property string pluginsInstallDir: project.libDirName + "/qtcreator"
         property string appInstallDir: project.ide_libexec_path
+        property string relativePluginsPath: FileInfo.relativePath(appInstallDir, pluginsInstallDir)
+        property string relativeSearchPath: FileInfo.relativePath(appInstallDir,
+                                                                  resourcesInstallDir)
 
         references: [
             qbsBaseDir + "/src/lib/libs.qbs",