diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index ccf023bef79c87a199af8bf6bb39923c367623c0..f7ae389ffe5df952ab88bcfe4872477160db62e4 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -55,6 +55,7 @@
 
 #include <QtGui/QComboBox>
 #include <QtGui/QCheckBox>
+#include <QtGui/QDesktopServices>
 #include <QtGui/QFormLayout>
 #include <QtGui/QFrame>
 #include <QtGui/QHBoxLayout>
@@ -1146,6 +1147,10 @@ const QStringList AbstractMaemoRunControl::options() const
         devConfig.authentication == MaemoDeviceConfigurations::DeviceConfig::Password;
     const QLatin1String opt("-o");
     QStringList optionList;
+#ifdef Q_OS_WIN
+    optionList << opt << QString::fromLatin1("UserKnownHostsFile=%1/maemo_knownHosts").
+        arg(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
+#endif
     if (!usePassword)
         optionList << QLatin1String("-i") << devConfig.keyFile;
     return optionList << opt
@@ -1153,7 +1158,9 @@ const QStringList AbstractMaemoRunControl::options() const
             arg(usePassword ? "yes" : "no") << opt
         << QString::fromLatin1("PubkeyAuthentication=%1").
             arg(usePassword ? "no" : "yes") << opt
-        << QString::fromLatin1("ConnectTimeout=%1").arg(devConfig.timeout);
+        << QString::fromLatin1("ConnectTimeout=%1").arg(devConfig.timeout)
+        << opt << QLatin1String("CheckHostIP=no")
+        << opt << QLatin1String("StrictHostKeyChecking=no");
 }
 
 const QString AbstractMaemoRunControl::executableOnTarget() const
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
index e3ceb22939a7fdea9a7f352f5e8d6ce104b045d7..fd755e7b2320769afce18987c2a684421b0ecde1 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
@@ -85,10 +85,6 @@ void MaemoToolChain::addToEnvironment(ProjectExplorer::Environment &env)
         .arg(targetRoot())));
     env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin")
         .arg(toolchainRoot())));
-#ifdef Q_OS_WIN
-    env.set("HOME", QDir::toNativeSeparators(maddeRoot()
-        + QLatin1String("/home/") + QDir::home().dirName()));
-#endif
 }
 
 QString MaemoToolChain::makeCommand() const