diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
index 80861bab93d..4a176c7a6df 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
@@ -147,7 +147,7 @@ void AbstractMaemoRunControl::startDeployment(bool forDebugging)
             if (dumperInfo.exists()) {
                 const MaemoDeployable d(m_runConfig->dumperLib(),
                     remoteDir() + '/' + dumperInfo.fileName());
-                m_needsInstall = addDeployableIfNeeded(d);
+                m_needsInstall |= addDeployableIfNeeded(d);
             }
         }
         deploy();
@@ -452,6 +452,7 @@ MaemoDebugRunControl::~MaemoDebugRunControl()
 void MaemoDebugRunControl::startInternal()
 {
     m_debuggingStarted = false;
+    m_remoteOutput.clear();
     startDeployment(true);
 }
 
@@ -465,8 +466,11 @@ QString MaemoDebugRunControl::remoteCall() const
 void MaemoDebugRunControl::handleRemoteOutput(const QString &output)
 {
     if (!m_debuggingStarted) {
-        m_debuggingStarted = true;
-        startDebugging();
+        m_remoteOutput += output;
+        if (m_remoteOutput.contains(QLatin1String("Listening on port"))) {
+            m_debuggingStarted = true;
+            startDebugging();
+        }
     }
     emit addToOutputWindowInline(this, output, false);
 }
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h
index 9230bfd6c1c..e01d2c27ed3 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h
@@ -164,6 +164,7 @@ private:
     QSharedPointer<Debugger::DebuggerStartParameters> m_startParams;
 
     bool m_debuggingStarted;
+    QString m_remoteOutput;
 };
 
 } // namespace Internal