diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.h b/src/plugins/debugger/gdb/remotegdbserveradapter.h
index 7eb89200c795eba3bb2c21693ad4c4d261d3c059..0f514e4ac33ff2f78db1d463fd490323da9d273e 100644
--- a/src/plugins/debugger/gdb/remotegdbserveradapter.h
+++ b/src/plugins/debugger/gdb/remotegdbserveradapter.h
@@ -65,6 +65,14 @@ private:
     AbstractGdbProcess *gdbProc() { return &m_gdbProc; }
 
 signals:
+    /*
+     * For "external" clients of a debugger run control that need to do
+     * further setup before the debugger is started (e.g. Maemo).
+     * Afterwards, handleSetupDone() or handleSetupFailed() must be called
+     * to continue or abort debugging, respectively.
+     * This signal is only emitted if the start parameters indicate that
+     * a server start script should be used, but none is given.
+     */
     void requestSetup();
 
 private:
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
index 31c852bc1d4331397986f134c401158627c8cc4c..72c6081046eda7e54f1b60f919b4198ecea7e08f 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
@@ -84,6 +84,7 @@ RunControl *MaemoDebugSupport::createDebugRunControl(MaemoRunConfiguration *runC
         params.debuggerCommand = runConfig->gdbCmd();
         params.remoteChannel = devConf.server.host + QLatin1Char(':')
             + QString::number(gdbServerPort(runConfig));
+        params.useServerStartScript = true;
         params.remoteArchitecture = QLatin1String("arm");
     }
     params.processArgs = runConfig->arguments();