diff --git a/src/plugins/qmlprojectmanager/wizards/templates/app.pro b/src/plugins/qmlprojectmanager/wizards/templates/app.pro
index 63e81221d64cd7be753fd1b630b3cad47b275c94..5827cc6b4b1a7ba088db18cc2a717d553b4c7af9 100644
--- a/src/plugins/qmlprojectmanager/wizards/templates/app.pro
+++ b/src/plugins/qmlprojectmanager/wizards/templates/app.pro
@@ -30,11 +30,17 @@ symbian {
     contains(DEFINES, NETWORKACCESS):TARGET.CAPABILITY += NetworkServices
 } else:win32 {
     # Ossi will want to kill me when he reads this
-    # TODO: let Ossi create a (post link step) deployment for windows
-    !contains(CONFIG, build_pass):for(deploymentfolder, DEPLOYMENTFOLDERS) {
-        pathSegments = $$split(deploymentfolder, /)
-        sourceAndTarget = $$deploymentfolder $$OUT_PWD/qml/$$last(pathSegments)
-        system($$QMAKE_COPY_DIR $$replace(sourceAndTarget, /, \\))
+    # TODO: Let Ossi do some deployment-via-qmake magic
+    !isEqual(PWD,$$OUT_PWD):!contains(CONFIG, build_pass) {
+        copyCommand = @echo Copying Qml files...
+        for(deploymentfolder, DEPLOYMENTFOLDERS) {
+            pathSegments = $$split(deploymentfolder, /)
+            sourceAndTarget = $$PWD/$$deploymentfolder $$OUT_PWD/qml/$$last(pathSegments)
+            copyCommand += && $(COPY_DIR) $$replace(sourceAndTarget, /, \\)
+        }
+        copyqmlfiles.commands = $$copyCommand
+        first.depends = $(first) copyqmlfiles
+        QMAKE_EXTRA_TARGETS += first copyqmlfiles
     }
 } else {
     # TODO: make this work