diff --git a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
index f3f7d60589800e915109cb0b63237441520b7173..bff66d6adc352dffc3c5dac0b12e032c08eda4d5 100644
--- a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
+++ b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
@@ -29,6 +29,7 @@
 ** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
+
 #include "maddeuploadandinstallpackagesteps.h"
 
 #include "maemopackagecreationstep.h"
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..033da60b62afef826cd1f760a1cc56e3e7978efa
--- /dev/null
+++ b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
@@ -0,0 +1,91 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
+#include "embeddedlinuxqtversion.h"
+
+#include "remotelinux_constants.h"
+
+#include <QtCore/QCoreApplication>
+
+namespace RemoteLinux {
+namespace Internal {
+
+EmbeddedLinuxQtVersion::EmbeddedLinuxQtVersion()
+    : BaseQtVersion()
+{ }
+
+EmbeddedLinuxQtVersion::EmbeddedLinuxQtVersion(const QString &path, bool isAutodetected, const QString &autodetectionSource)
+    : BaseQtVersion(path, isAutodetected, autodetectionSource)
+{ }
+
+EmbeddedLinuxQtVersion::~EmbeddedLinuxQtVersion()
+{ }
+
+EmbeddedLinuxQtVersion *EmbeddedLinuxQtVersion::clone() const
+{
+    return new EmbeddedLinuxQtVersion(*this);
+}
+
+QString EmbeddedLinuxQtVersion::type() const
+{
+    return RemoteLinux::Constants::EMBEDDED_LINUX_QT;
+}
+
+QString EmbeddedLinuxQtVersion::warningReason() const
+{
+    if (qtAbis().count() == 1 && qtAbis().first().isNull())
+        return QCoreApplication::translate("QtVersion", "ABI detection failed: Make sure to use a matching tool chain when building.");
+    return QString();
+}
+
+QList<ProjectExplorer::Abi> EmbeddedLinuxQtVersion::detectQtAbis() const
+{
+    return qtAbisFromLibrary(qtCorePath(versionInfo(), qtVersionString()));
+}
+
+bool EmbeddedLinuxQtVersion::supportsTargetId(const QString &id) const
+{
+    return id == QLatin1String(Constants::EMBEDDED_LINUX_TARGET_ID);
+}
+
+QSet<QString> EmbeddedLinuxQtVersion::supportedTargetIds() const
+{
+    return QSet<QString>() << QLatin1String(Constants::EMBEDDED_LINUX_TARGET_ID);
+}
+
+QString EmbeddedLinuxQtVersion::description() const
+{
+    return QCoreApplication::translate("QtVersion", "Embedded Linux", "Qt Version is used for embedded Linux development");
+}
+
+} // namespace Internal
+} // namespace RemoteLinux
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.h b/src/plugins/remotelinux/embeddedlinuxqtversion.h
new file mode 100644
index 0000000000000000000000000000000000000000..1c883c0ddb8fee3d1c73bbac49a4c54a2323a407
--- /dev/null
+++ b/src/plugins/remotelinux/embeddedlinuxqtversion.h
@@ -0,0 +1,64 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
+#ifndef EMBEDDEDLINUXQTVERSION_H
+#define EMBEDDEDLINUXQTVERSION_H
+
+#include <qtsupport/baseqtversion.h>
+
+namespace RemoteLinux {
+namespace Internal {
+
+class EmbeddedLinuxQtVersion : public QtSupport::BaseQtVersion
+{
+public:
+    EmbeddedLinuxQtVersion();
+    EmbeddedLinuxQtVersion(const QString &path, bool isAutodetected = false, const QString &autodetectionSource = QString());
+    ~EmbeddedLinuxQtVersion();
+    EmbeddedLinuxQtVersion *clone() const;
+
+    QString type() const;
+
+    QString warningReason() const;
+
+    QList<ProjectExplorer::Abi> detectQtAbis() const;
+
+    bool supportsTargetId(const QString &id) const;
+    QSet<QString> supportedTargetIds() const;
+
+    QString description() const;
+};
+
+} // namespace Internal
+} // namespace RemoteLinux
+
+#endif // EMBEDDEDLINUXQTVERSION_H
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d25172f8ac8c93b08ad60ce85a199f6e2f0cb7c4
--- /dev/null
+++ b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp
@@ -0,0 +1,93 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
+#include "embeddedlinuxqtversionfactory.h"
+
+#include "embeddedlinuxqtversion.h"
+#include "remotelinux_constants.h"
+
+#include <QtCore/QFileInfo>
+
+namespace RemoteLinux {
+namespace Internal {
+
+EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory(QObject *parent) : QtSupport::QtVersionFactory(parent)
+{ }
+
+EmbeddedLinuxQtVersionFactory::~EmbeddedLinuxQtVersionFactory()
+{ }
+
+bool EmbeddedLinuxQtVersionFactory::canRestore(const QString &type)
+{
+    return type == QLatin1String(RemoteLinux::Constants::EMBEDDED_LINUX_QT);
+}
+
+QtSupport::BaseQtVersion *EmbeddedLinuxQtVersionFactory::restore(const QString &type, const QVariantMap &data)
+{
+    if (!canRestore(type))
+        return 0;
+    EmbeddedLinuxQtVersion *v = new EmbeddedLinuxQtVersion;
+    v->fromMap(data);
+    return v;
+}
+
+int EmbeddedLinuxQtVersionFactory::priority() const
+{
+    return 10;
+}
+
+QtSupport::BaseQtVersion *EmbeddedLinuxQtVersionFactory::create(const QString &qmakePath,
+                                                                ProFileEvaluator *evaluator,
+                                                                bool isAutoDetected,
+                                                                const QString &autoDetectionSource)
+{
+    Q_UNUSED(evaluator);
+
+    QFileInfo fi(qmakePath);
+    if (!fi.exists() || !fi.isExecutable() || !fi.isFile())
+        return 0;
+
+    EmbeddedLinuxQtVersion *version = new EmbeddedLinuxQtVersion(qmakePath, isAutoDetected, autoDetectionSource);
+
+    QList<ProjectExplorer::Abi> abis = version->qtAbis();
+    // Note: This fails for e.g. intel/meego cross builds on x86 linux machines.
+    if (abis.count() == 1
+            && abis.at(0).os() == ProjectExplorer::Abi::LinuxOS
+            && !ProjectExplorer::Abi::hostAbi().isCompatibleWith(abis.at(0)))
+        return version;
+
+    delete version;
+    return 0;
+}
+
+} // namespace Internal
+} // namespace RemoteLinux
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h
new file mode 100644
index 0000000000000000000000000000000000000000..1906b05af7edb2637e34edf29142feddd6918744
--- /dev/null
+++ b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h
@@ -0,0 +1,59 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
+#ifndef EMBEDDEDLINUXQTVERSIONFACTORY_H
+#define EMBEDDEDLINUXQTVERSIONFACTORY_H
+
+#include <qtsupport/qtversionfactory.h>
+
+namespace RemoteLinux {
+namespace Internal {
+
+class EmbeddedLinuxQtVersionFactory : public QtSupport::QtVersionFactory
+{
+public:
+    explicit EmbeddedLinuxQtVersionFactory(QObject *parent = 0);
+    ~EmbeddedLinuxQtVersionFactory();
+
+    bool canRestore(const QString &type);
+    QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data);
+
+    int priority() const;
+    QtSupport::BaseQtVersion *create(const QString &qmakePath, ProFileEvaluator *evaluator,
+                                     bool isAutoDetected = false,
+                                     const QString &autoDetectionSource = QString());
+};
+
+} // Internal
+} // RemoteLinux
+
+#endif // EMBEDDEDLINUXQTVERSIONFACTORY_H
diff --git a/src/plugins/remotelinux/remotelinux.pro b/src/plugins/remotelinux/remotelinux.pro
index 3d19049f7e82f8f4f496f24ce903560e19787459..7614cfc6c72d701830bd307a25dd0f55f604cd41 100644
--- a/src/plugins/remotelinux/remotelinux.pro
+++ b/src/plugins/remotelinux/remotelinux.pro
@@ -5,6 +5,8 @@ include(../../qtcreatorplugin.pri)
 include(remotelinux_dependencies.pri)
 
 HEADERS += \
+    embeddedlinuxqtversion.h \
+    embeddedlinuxqtversionfactory.h \
     remotelinuxplugin.h \
     remotelinux_export.h \
     linuxdeviceconfiguration.h \
@@ -60,6 +62,8 @@ HEADERS += \
     remotelinuxcustomcommanddeploymentstep.h
 
 SOURCES += \
+    embeddedlinuxqtversion.cpp \
+    embeddedlinuxqtversionfactory.cpp \
     remotelinuxplugin.cpp \
     linuxdeviceconfiguration.cpp \
     linuxdeviceconfigurations.cpp \
diff --git a/src/plugins/remotelinux/remotelinux_constants.h b/src/plugins/remotelinux/remotelinux_constants.h
index 9ae1d3b84f47c6c2746f9f1fcdf0342281b588ec..a32516589647b74176ec3dabca481b1d7fb0014b 100644
--- a/src/plugins/remotelinux/remotelinux_constants.h
+++ b/src/plugins/remotelinux/remotelinux_constants.h
@@ -43,6 +43,9 @@ const char GenericTestDeviceActionId[] = "RemoteLinux.GenericTestDeviceAction";
 const char GenericDeployKeyToDeviceActionId[] = "RemoteLinux.GenericDeployKeyToDeviceAction";
 const char GenericRemoteProcessesActionId[] = "RemoteLinux.GenericRemoteProcessesAction";
 
+const char EMBEDDED_LINUX_QT[] = "RemoteLinux.EmbeddedLinuxQt";
+const char EMBEDDED_LINUX_TARGET_ID[] = "RemoteLinux.EmbeddedLinuxTarget";
+
 } // Constants
 } // RemoteLinux
 
diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp
index 17a46fe1ae2069cc17c04dc0ea77a99d981d2163..1fe931afe3da6d2c3da8c780ee9dc486ce1aa1bb 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.cpp
+++ b/src/plugins/remotelinux/remotelinuxplugin.cpp
@@ -32,6 +32,7 @@
 
 #include "remotelinuxplugin.h"
 
+#include "embeddedlinuxqtversionfactory.h"
 #include "deployablefile.h"
 #include "genericlinuxdeviceconfigurationfactory.h"
 #include "genericremotelinuxdeploystepfactory.h"
@@ -77,6 +78,8 @@ bool RemoteLinuxPlugin::initialize(const QStringList &arguments,
     addAutoReleasedObject(new RemoteLinuxDeployConfigurationFactory);
     addAutoReleasedObject(new GenericRemoteLinuxDeployStepFactory);
 
+    addAutoReleasedObject(new EmbeddedLinuxQtVersionFactory);
+
     qRegisterMetaType<RemoteLinux::DeployableFile>("RemoteLinux::DeployableFile");
 
     return true;