diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 0141f4e39aa..ceaed53ed8c 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -221,6 +221,9 @@ void S60DeviceRunConfiguration::updateTarget()
     }
 
     m_targetName = reader->value("TARGET");
+    if (m_targetName.isEmpty())
+        m_targetName = QFileInfo(m_proFilePath).baseName();
+
     m_baseFileName = QDir::cleanPath(m_workingDir + QLatin1Char('/') + m_targetName);
 
     if (pro->toolChainType(pro->activeBuildConfiguration()) == ToolChain::GCCE)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
index 28f803e562f..d55b1978c7d 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
@@ -149,8 +149,12 @@ void S60EmulatorRunConfiguration::updateTarget()
         qmakeBuildConfig = "udeb";
     baseDir += "/epoc32/release/winscw/" + qmakeBuildConfig;
 
+    QString target = reader->value("TARGET");
+    if (target.isEmpty())
+        target = QFileInfo(m_proFilePath).baseName();
+
     m_executable = QDir::toNativeSeparators(
-            QDir::cleanPath(baseDir + QLatin1Char('/') + reader->value("TARGET")));
+            QDir::cleanPath(baseDir + QLatin1Char('/') + target));
     m_executable += QLatin1String(".exe");
 
     delete reader;
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index df24a8c15c6..f55336ed406 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -592,16 +592,20 @@ void Qt4RunConfiguration::updateTarget()
         }
     }
 
+    QString target = reader->value("TARGET");
+    if (target.isEmpty())
+        target = QFileInfo(m_proFilePath).baseName();
+
 #if defined (Q_OS_MAC)
     if (reader->values("CONFIG").contains("app_bundle")) {
         m_workingDir += QLatin1Char('/')
-                   + reader->value("TARGET")
+                   + target
                    + QLatin1String(".app/Contents/MacOS");
     }
 #endif
 
     m_workingDir = QDir::cleanPath(m_workingDir);
-    m_executable = QDir::cleanPath(m_workingDir + QLatin1Char('/') + reader->value("TARGET"));
+    m_executable = QDir::cleanPath(m_workingDir + QLatin1Char('/') + target);
     //qDebug()<<"##### updateTarget sets:"<<m_workingDir<<m_executable;
 
 #if defined (Q_OS_WIN)