1 files changed, 3 insertions, 2 deletions
diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs
index a7332a4ea..c651d8f61 100644
--- a/share/qbs/modules/bundle/BundleModule.qbs
+++ b/share/qbs/modules/bundle/BundleModule.qbs
@@ -98,7 +98,8 @@ Module {
         }
     }
 
-    additionalProductTypes: ["bundle.content"]
+    additionalProductTypes: !(product.multiplexed || product.aggregate)
+                            || !product.multiplexConfigurationId ? ["bundle.content"] : []
 
     property bool isBundle: !product.consoleApplication && qbs.targetOS.contains("darwin")
 
@@ -641,7 +642,7 @@ Module {
 
             var executables = outputs["bundle.symlink.executable"];
             for (i in executables) {
-                cmd = new Command("ln", ["-sf", FileInfo.joinPaths("Versions", "Current", product.targetName),
+                cmd = new Command("ln", ["-sfn", FileInfo.joinPaths("Versions", "Current", product.targetName),
                                          executables[i].filePath]);
                 cmd.silent = true;
                 commands.push(cmd);