diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 583a041b9f7dc98151ec17f7d585e2786ace8276..13a145aedb29ba4b9fb7f374ed4672bdd16b5ec9 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -591,7 +591,7 @@ void S60DeviceRunControl::signsisProcessFinished()
     m_adapter->setCopyFileName(copySrc, copyDst);
     m_adapter->setInstallFileName(copyDst);
     m_adapter->setFileName(runFileName);
-    emit addToOutputWindow(this, tr("Starting application on %1...").arg(m_serialPortFriendlyName));
+    emit addToOutputWindow(this, tr("Deploying application to %1...").arg(m_serialPortFriendlyName));
     if (!m_adapter->startServer()) {
         delete m_adapter;
         m_adapter = 0;
@@ -613,7 +613,7 @@ void S60DeviceRunControl::printInstallingNotice()
 
 void S60DeviceRunControl::printStartingNotice()
 {
-    emit addToOutputWindow(this, tr("Running application..."));
+    emit addToOutputWindow(this, tr("Starting application..."));
 }
 
 void S60DeviceRunControl::printRunNotice(uint pid)
diff --git a/tests/manual/trk/trkutils.cpp b/tests/manual/trk/trkutils.cpp
index 5b6ea12ce6075f4e29fe92ddebd2258675d8a6d4..4f18be2ad9d68e835831ed20d74c42c6eb578721 100644
--- a/tests/manual/trk/trkutils.cpp
+++ b/tests/manual/trk/trkutils.cpp
@@ -106,6 +106,7 @@ TrkResult extractResult(QByteArray *buffer)
     if (buffer->at(4) != 0x7e) {
         result.isDebugOutput = true;
         result.data = buffer->mid(4, len);
+        result.data.replace("\r\n", "\n");
         *buffer = buffer->mid(4 + len);
         return result;
     }