diff --git a/src/plugins/debugger/cdb/cdbdebugengine.cpp b/src/plugins/debugger/cdb/cdbdebugengine.cpp
index d5a72cf45438da7f0db3c4a7d55c694151985dd5..a81472ac656601415991eead848b4a7e1e7f7e07 100644
--- a/src/plugins/debugger/cdb/cdbdebugengine.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugengine.cpp
@@ -152,10 +152,10 @@ bool CdbDebugEnginePrivate::init(QString *errorMessage)
             manager(), SLOT(showDebuggerOutput(int,QString)));
     connect(output, SIGNAL(debuggerInputPrompt(int,QString)),
             manager(), SLOT(showDebuggerInput(int,QString)));
-    connect(output, SIGNAL(debuggeeOutput(QString)),
-            manager(), SLOT(showApplicationOutput(QString)));
-    connect(output, SIGNAL(debuggeeInputPrompt(QString)),
-            manager(), SLOT(showApplicationOutput(QString)));
+    connect(output, SIGNAL(debuggeeOutput(QString,bool)),
+            manager(), SLOT(showApplicationOutput(QString,bool)));
+    connect(output, SIGNAL(debuggeeInputPrompt(QString,bool)),
+            manager(), SLOT(showApplicationOutput(QString,bool)));
 
     setDebugEventCallback(DebugEventCallbackBasePtr(new CdbDebugEventCallback(m_engine)));
     updateCodeLevel();
diff --git a/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp b/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
index a7ad1107fd4543bc47774e21bc2b3e7dfd8da1b7..833bdb2d258bf4a979a22c73c97a29b7b649e22a 100644
--- a/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
@@ -79,7 +79,7 @@ STDMETHODIMP CdbDebugEventCallback::Exception(
     const bool fatal = isFatalException(Exception->ExceptionCode);
     if (debugCDB)
         qDebug() << Q_FUNC_INFO << "\nex=" << Exception->ExceptionCode << " fatal=" << fatal << msg;
-    m_pEngine->manager()->showApplicationOutput(msg);
+    m_pEngine->manager()->showApplicationOutput(msg, true);
     m_pEngine->manager()->showDebuggerOutput(LogMisc, msg);
     m_pEngine->m_d->notifyException(Exception->ExceptionCode, fatal, msg);
     return S_OK;
diff --git a/src/plugins/debugger/cdb/cdbdebugoutput.cpp b/src/plugins/debugger/cdb/cdbdebugoutput.cpp
index 9e040042129f66a9cfa68ec08ebd8b2c33fa60a9..0b7dd4eb711fd60828b2f64472ff224041f06425 100644
--- a/src/plugins/debugger/cdb/cdbdebugoutput.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugoutput.cpp
@@ -81,10 +81,10 @@ void CdbDebugOutput::output(ULONG mask, const QString &msg)
         emit debuggerInputPrompt(logChannel(mask), msg);
         break;
     case DebuggeeOutput:
-        emit debuggeeOutput(msg);
+        emit debuggeeOutput(msg, true);
         break;
     case DebuggeePromptOutput:
-        emit debuggeeInputPrompt(msg);
+        emit debuggeeInputPrompt(msg, false);
         break;
     }
 }
diff --git a/src/plugins/debugger/cdb/cdbdebugoutput.h b/src/plugins/debugger/cdb/cdbdebugoutput.h
index 647eaedf11f5ac6bb8bab8264ce96952448b34df..989c937ca541c7bf8290c07e035aeec9a6989a8e 100644
--- a/src/plugins/debugger/cdb/cdbdebugoutput.h
+++ b/src/plugins/debugger/cdb/cdbdebugoutput.h
@@ -50,8 +50,8 @@ protected:
 signals:
     void debuggerOutput(int channel, const QString &message);
     void debuggerInputPrompt(int channel, const QString &message);
-    void debuggeeOutput(const QString &message);
-    void debuggeeInputPrompt(const QString &message);
+    void debuggeeOutput(const QString &message, bool onStderr);
+    void debuggeeInputPrompt(const QString &message, bool onStderr);
 };
 
 } // namespace Internal