diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index fb8517feb9af48079a9d03f91b49d4bc3bea72a8..d5c1102b9e0496da10f7fb4174e9bf1d2fca296b 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -205,13 +205,13 @@ void DebuggerMainWindowPrivate::updateUiForTarget(Target *target)
 void DebuggerMainWindowPrivate::updateUiForRunConfiguration(RunConfiguration *rc)
 {
     if (m_previousRunConfiguration)
-        disconnect(m_previousRunConfiguration, SIGNAL(debuggersChanged()),
+        disconnect(m_previousRunConfiguration->debuggerAspect(), SIGNAL(debuggersChanged()),
                    this, SLOT(updateUiForCurrentRunConfiguration()));
     m_previousRunConfiguration = rc;
     updateUiForCurrentRunConfiguration();
     if (!rc)
         return;
-    connect(m_previousRunConfiguration,
+    connect(m_previousRunConfiguration->debuggerAspect(),
             SIGNAL(debuggersChanged()),
             SLOT(updateUiForCurrentRunConfiguration()));
 }
diff --git a/src/plugins/madde/maemorunconfigurationwidget.cpp b/src/plugins/madde/maemorunconfigurationwidget.cpp
index 6e7548e26b26db3ca7c61640c46d54d1c6019223..95d238c8af54ce7e8b6c4217fa460be0152c54b6 100644
--- a/src/plugins/madde/maemorunconfigurationwidget.cpp
+++ b/src/plugins/madde/maemorunconfigurationwidget.cpp
@@ -85,7 +85,8 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget(
     addMountWidgets(subLayout);
     connect(m_runConfiguration, SIGNAL(deviceConfigurationChanged(ProjectExplorer::Target*)),
         this, SLOT(updateMountWarning()));
-    connect(m_runConfiguration, SIGNAL(debuggersChanged()), SLOT(updateMountWarning()));
+    connect(m_runConfiguration->debuggerAspect(), SIGNAL(debuggersChanged()),
+            SLOT(updateMountWarning()));
     updateMountWarning();
 
     const AbstractQt4MaemoTarget * const maemoTarget
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index a3d52ba72c7090f84ec689ce4ce4357a2d39927a..c9a908c046076a41a16ad761e82df903c05643e3 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -2198,14 +2198,14 @@ void ProjectExplorerPlugin::activeRunConfigurationChanged()
     if (previousRunConfiguration) {
         disconnect(previousRunConfiguration, SIGNAL(isEnabledChanged(bool)),
                    this, SIGNAL(updateRunActions()));
-        disconnect(previousRunConfiguration, SIGNAL(debuggersChanged()),
+        disconnect(previousRunConfiguration->debuggerAspect(), SIGNAL(debuggersChanged()),
                    this, SIGNAL(updateRunActions()));
     }
     previousRunConfiguration = rc;
     if (rc) {
         connect(rc, SIGNAL(isEnabledChanged(bool)),
                 this, SIGNAL(updateRunActions()));
-        connect(rc, SIGNAL(debuggersChanged()),
+        connect(rc->debuggerAspect(), SIGNAL(debuggersChanged()),
                 this, SIGNAL(updateRunActions()));
     }
     emit updateRunActions();
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 42bc90afa8b32d4da4511bcee8e113ab36864aaf..a23357fe55840cd7f2344a300b99f38533d64adc 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -253,12 +253,6 @@ uint DebuggerProjectSettings::qmlDebugServerPort() const
     return m_qmlDebugServerPort;
 }
 
-void DebuggerProjectSettings::setQmlDebugServerPort(uint port)
-{
-    m_qmlDebugServerPort = port;
-    emit qmlDebugServerPortChanged(port);
-}
-
 void DebuggerProjectSettings::suppressQmlDebuggingOptions()
 {
     m_suppressQmlDebuggingOptions = true;
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index aafd5385bb90319be141810bc02b574139aa6763..cfbadbaba3efa855af8b4d53106c8bf4c8103c04 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -112,13 +112,11 @@ public:
     bool useCppDebugger() const;
     QmlDebuggerStatus useQmlDebugger() const;
     uint qmlDebugServerPort() const;
-    void setQmlDebugServerPort(uint port);
     void suppressQmlDebuggingOptions();
     bool areQmlDebuggingOptionsSuppressed() const;
 
 signals:
     void debuggersChanged();
-    void qmlDebugServerPortChanged(uint port);
 
 public:
     bool m_useCppDebugger;
@@ -168,8 +166,6 @@ public:
 
 signals:
     void isEnabledChanged(bool value);
-    void debuggersChanged();
-    void qmlDebugServerPortChanged(uint port);
 
 protected:
     RunConfiguration(Target *parent, const QString &id);