diff --git a/qtcreator.pro b/qtcreator.pro
index 8e3676ab14b4f6c8b8d02bf7a988f7cc332fd6fe..5fc32ced5d1986b2b5c2b40e61cad10633614909 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -50,6 +50,10 @@ exists(src/shared/qbs/qbs.pro) {
     }
     system("echo QBS_PLUGINS_INSTALL_DIR = $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator >> $$qmake_cache")
     system("echo QBS_LIBRARY_DIRNAME = $${IDE_LIBRARY_BASENAME} >> $$qmake_cache")
+    system("echo QBS_APPS_DESTDIR = $${IDE_BIN_PATH} >> $$qmake_cache")
+    system("echo QBS_APPS_INSTALL_DIR = $${QTC_PREFIX}/bin >> $$qmake_cache")
+    system("echo macx:QBS_APPS_RPATH_DIR = @loader_path/../PlugIns >> $$qmake_cache")
+    system("echo else:QBS_APPS_RPATH_DIR = '\\\$\\\$ORIGIN/../'/lib/qtcreator >> $$qmake_cache")
     system("echo CONFIG += qbs_no_dev_install >> $$qmake_cache")
 }
 
diff --git a/src/libs/libs.pro b/src/libs/libs.pro
index 085a014bd0f2583149dfa466dca7f70f7db49bcf..148e556945c355a8d673c99e68d9348e11644687 100644
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -29,11 +29,14 @@ minQtVersion(5, 0, 0) {
     QBS_DIRS = \
         corelib \
         qtprofilesetup \
+        apps \
         ../shared/qbs/src/plugins \
         ../shared/qbs/static.pro
     corelib.subdir = ../shared/qbs/src/lib/corelib
     qtprofilesetup.subdir = ../shared/qbs/src/lib/qtprofilesetup
     qtprofilesetup.depends = corelib
+    apps.subdir = ../shared/qbs/src/app
+    apps.depends = qtprofilesetup
 
     exists(../shared/qbs/qbs.pro): SUBDIRS += $$QBS_DIRS
     TR_EXCLUDE = $$QBS_DIRS
diff --git a/src/src.qbs b/src/src.qbs
index bca1658abf60b8d967008a6da9d2b1085df2ac8e..d5dc32d04158c56cd7c3d9898b3c00ec6825bda8 100644
--- a/src/src.qbs
+++ b/src/src.qbs
@@ -23,16 +23,18 @@ Project {
 
         property bool enableUnitTests: false
         property bool installApiHeaders: false
-        property path libInstallDir: project.ide_library_path
-        property path libRPaths:  qbs.targetOS.contains("osx")
-            ? ["@loader_path/.."] : ["$ORIGIN/.."]
-        property path resourcesInstallDir: project.ide_data_path + "/qbs"
+        property string libInstallDir: project.ide_library_path
+        property stringList libRPaths:  qbs.targetOS.contains("osx")
+            ? ["@loader_path/.."] : ["$ORIGIN/..", "$ORIGIN/../" + project.ide_library_path]
+        property string resourcesInstallDir: project.ide_data_path + "/qbs"
         property string pluginsInstallDir: project.libDirName + "/qtcreator"
+        property string appInstallDir: project.ide_libexec_path
 
         references: [
             qbsBaseDir + "/src/lib/libs.qbs",
             qbsBaseDir + "/src/plugins/plugins.qbs",
-            qbsBaseDir + "/share/share.qbs"
+            qbsBaseDir + "/share/share.qbs",
+            qbsBaseDir + "/src/app/apps.qbs",
         ]
     }
 }