diff --git a/src/app/app.pro b/src/app/app.pro
index d1f917196d27b09b786ee18c75769de9cd11b4b8..ee298d521d664f6808bd82e0e04af420f5a647ae 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -3,22 +3,6 @@ IDE_BUILD_TREE = $$OUT_PWD/../../
 include(../qworkbench.pri)
 include(../shared/qtsingleapplication/qtsingleapplication.pri)
 
-macx {
-    CONFIG(debug, debug|release):LIBS *= -lExtensionSystem_debug -lAggregation_debug
-    else:LIBS *= -lExtensionSystem -lAggregation
-}
-win32 {
-    CONFIG(debug, debug|release):LIBS *= -lExtensionSystemd -lAggregationd
-    else:LIBS *= -lExtensionSystem -lAggregation
-}
-unix:!macx {
-    LIBS *= -lExtensionSystem -lAggregation
-
-    target.path  = /bin
-    INSTALLS    += target
-
-}
-
 TEMPLATE = app
 TARGET = $$IDE_APP_TARGET
 DESTDIR = ../../bin
@@ -36,5 +20,33 @@ macx {
         ICON = qtcreator.icns
 }
 
-include(../../share/share.pri)
+macx {
+    CONFIG(debug, debug|release):LIBS *= -lExtensionSystem_debug -lAggregation_debug
+    else:LIBS *= -lExtensionSystem -lAggregation
+}
+win32 {
+    CONFIG(debug, debug|release):LIBS *= -lExtensionSystemd -lAggregationd
+    else:LIBS *= -lExtensionSystem -lAggregation
+}
+unix:!macx {
+    LIBS *= -lExtensionSystem -lAggregation
+
+    # make sure the wrapper is in place
+    !exists($$OUT_PWD/app.pro) {
+        # we are shadow build
+        COPYSRC = $$PWD/$$DESTDIR/$$IDE_APP_WRAPPER
+        COPYDEST = $$OUT_PWD/$$DESTDIR/$$IDE_APP_WRAPPER
+        win32:COPYSRC ~= s|/+|\|
+        win32:COPYDEST ~= s|/+|\|
+        unix:SEPARATOR = ;
+        win32:SEPARATOR = &
+        QMAKE_POST_LINK += $${QMAKE_COPY_FILE} $${COPYSRC} $${COPYDEST} $$SEPARATOR
+    }
+
+    target.files += $$OUT_PWD/$$DESTDIR/$$IDE_APP_WRAPPER
+    target.path  = /bin
+    INSTALLS    += target
+
+}
 
+include(../../share/share.pri)
diff --git a/src/qworkbench.pri b/src/qworkbench.pri
index 2c824c5591747795d490b9dd11a389db9c85a3e8..17df81d9655ee099fbdbeb734418b6234351f74f 100644
--- a/src/qworkbench.pri
+++ b/src/qworkbench.pri
@@ -26,6 +26,7 @@ macx {
     IDE_PLUGIN_PATH  = $$IDE_LIBRARY_PATH 
     contains(QT_CONFIG, ppc):CONFIG += ppc x86
 } else {
+    IDE_APP_WRAPPER  = qtcreator
     IDE_APP_TARGET   = qtcreator.bin
     IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
     IDE_PLUGIN_PATH  = $$IDE_LIBRARY_PATH/plugins/