diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 38173f736aa..b38bbe76451 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -48,7 +48,8 @@ SUBDIRS   = \
     clearcase \
     baremetal \
     ios \
-    beautifier
+    beautifier \
+    qmakeandroidsupport
 
 minQtVersion(5, 0, 0) {
     SUBDIRS += winrt
diff --git a/src/plugins/qmakeandroidsupport/QmakeAndroidSupport.pluginspec.in b/src/plugins/qmakeandroidsupport/QmakeAndroidSupport.pluginspec.in
new file mode 100644
index 00000000000..d77e8fb4b29
--- /dev/null
+++ b/src/plugins/qmakeandroidsupport/QmakeAndroidSupport.pluginspec.in
@@ -0,0 +1,17 @@
+<plugin name=\"QmakeAndroidSupport\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\">
+    <vendor>Digia Plc</vendor>
+    <copyright>(C) 2014 Digia Plc</copyright>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation.  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.
+    </license>
+    <category>Build Systems</category>
+    <description>Android support for qmake project manager</description>
+    <url>http://www.qt-project.org</url>
+    $$dependencyList
+</plugin>
diff --git a/src/plugins/qmakeprojectmanager/androidextralibrarylistmodel.cpp b/src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.cpp
similarity index 99%
rename from src/plugins/qmakeprojectmanager/androidextralibrarylistmodel.cpp
rename to src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.cpp
index fc509457cbe..7dc01541bb1 100644
--- a/src/plugins/qmakeprojectmanager/androidextralibrarylistmodel.cpp
+++ b/src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.cpp
@@ -33,7 +33,7 @@
 #include <qmakeprojectmanager/qmakenodes.h>
 #include <proparser/prowriter.h>
 
-using namespace QmakeProjectManager;
+using namespace QmakeAndroidSupport;
 using namespace Internal;
 
 AndroidExtraLibraryListModel::AndroidExtraLibraryListModel(QmakeProjectManager::QmakeProject *project,
diff --git a/src/plugins/qmakeprojectmanager/androidextralibrarylistmodel.h b/src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.h
similarity index 97%
rename from src/plugins/qmakeprojectmanager/androidextralibrarylistmodel.h
rename to src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.h
index acc7adea61e..21be9dc81e1 100644
--- a/src/plugins/qmakeprojectmanager/androidextralibrarylistmodel.h
+++ b/src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.h
@@ -37,6 +37,9 @@
 namespace QmakeProjectManager {
 class QmakeProject;
 class QmakeProFileNode;
+}
+
+namespace QmakeAndroidSupport {
 
 namespace Internal {
 class AndroidExtraLibraryListModel : public QAbstractItemModel
@@ -70,6 +73,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QmakeProjectManager
+} // namespace QmakeAndroidSupport
 
 #endif // ANDROIDEXTRALIBRARYLISTMODEL_H
diff --git a/src/plugins/qmakeprojectmanager/androidpackageinstallationfactory.cpp b/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.cpp
similarity index 99%
rename from src/plugins/qmakeprojectmanager/androidpackageinstallationfactory.cpp
rename to src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.cpp
index a4ea9c378e5..db95ff47760 100644
--- a/src/plugins/qmakeprojectmanager/androidpackageinstallationfactory.cpp
+++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.cpp
@@ -39,7 +39,7 @@
 
 using namespace ProjectExplorer;
 
-namespace QmakeProjectManager {
+namespace QmakeAndroidSupport {
 namespace Internal {
 
 AndroidPackageInstallationFactory::AndroidPackageInstallationFactory(QObject *parent)
diff --git a/src/plugins/qmakeprojectmanager/androidpackageinstallationfactory.h b/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.h
similarity index 97%
rename from src/plugins/qmakeprojectmanager/androidpackageinstallationfactory.h
rename to src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.h
index 0202819f187..0e049386919 100644
--- a/src/plugins/qmakeprojectmanager/androidpackageinstallationfactory.h
+++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.h
@@ -32,7 +32,7 @@
 
 #include <projectexplorer/buildstep.h>
 
-namespace QmakeProjectManager {
+namespace QmakeAndroidSupport {
 namespace Internal {
 
 class AndroidPackageInstallationFactory: public ProjectExplorer::IBuildStepFactory
@@ -58,6 +58,6 @@ public:
 };
 
 } // namespace Internal
-} // namespace Android
+} // namespace QmakeAndroidSupport
 
 #endif // ANDROIDPACKAGEINSTALLATIONFACTORY_H
diff --git a/src/plugins/qmakeprojectmanager/androidpackageinstallationstep.cpp b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp
similarity index 97%
rename from src/plugins/qmakeprojectmanager/androidpackageinstallationstep.cpp
rename to src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp
index 55d5e05860d..4d540941bd2 100644
--- a/src/plugins/qmakeprojectmanager/androidpackageinstallationstep.cpp
+++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp
@@ -41,8 +41,8 @@
 
 #include <QDir>
 
-using namespace Android;
-using namespace QmakeProjectManager::Internal;
+using namespace QmakeAndroidSupport;
+using namespace QmakeAndroidSupport::Internal;
 
 const Core::Id AndroidPackageInstallationStep::Id = Core::Id("Qt4ProjectManager.AndroidPackageInstallationStep");
 namespace {
@@ -64,7 +64,7 @@ AndroidPackageInstallationStep::AndroidPackageInstallationStep(ProjectExplorer::
 bool AndroidPackageInstallationStep::init()
 {
     ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
-    QString dirPath = bc->buildDirectory().appendPath(QLatin1String(Constants::ANDROID_BUILDDIRECTORY)).toString();
+    QString dirPath = bc->buildDirectory().appendPath(QLatin1String(Android::Constants::ANDROID_BUILDDIRECTORY)).toString();
     if (Utils::HostOsInfo::isWindowsHost())
         if (bc->environment().searchInPath(QLatin1String("sh.exe")).isEmpty())
             dirPath = QDir::toNativeSeparators(dirPath);
diff --git a/src/plugins/qmakeprojectmanager/androidpackageinstallationstep.h b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h
similarity index 97%
rename from src/plugins/qmakeprojectmanager/androidpackageinstallationstep.h
rename to src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h
index 7d439aa9654..9f4439c46f4 100644
--- a/src/plugins/qmakeprojectmanager/androidpackageinstallationstep.h
+++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h
@@ -33,7 +33,7 @@
 #include <projectexplorer/buildstep.h>
 #include <projectexplorer/abstractprocessstep.h>
 
-namespace QmakeProjectManager {
+namespace QmakeAndroidSupport {
 namespace Internal {
 
 class AndroidPackageInstallationStep : public ProjectExplorer::AbstractProcessStep
@@ -70,6 +70,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Android
+} // namespace QmakeAndroidSupport
 
 #endif // ANDROIDPACKAGEINSTALLATIONSTEP_H
diff --git a/src/plugins/qmakeprojectmanager/androidqmakebuildconfigurationfactory.cpp b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp
similarity index 95%
rename from src/plugins/qmakeprojectmanager/androidqmakebuildconfigurationfactory.cpp
rename to src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp
index 4cbaa63ab85..26a0b1753ea 100644
--- a/src/plugins/qmakeprojectmanager/androidqmakebuildconfigurationfactory.cpp
+++ b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp
@@ -35,9 +35,9 @@
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/projectexplorerconstants.h>
 
-using namespace QmakeProjectManager;
-using namespace QmakeProjectManager::Internal;
-
+using namespace QmakeAndroidSupport;
+using namespace QmakeAndroidSupport::Internal;
+using QmakeProjectManager::QmakeBuildConfiguration;
 
 int AndroidQmakeBuildConfigurationFactory::priority(const ProjectExplorer::Kit *k, const QString &projectPath) const
 {
diff --git a/src/plugins/qmakeprojectmanager/androidqmakebuildconfigurationfactory.h b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h
similarity index 92%
rename from src/plugins/qmakeprojectmanager/androidqmakebuildconfigurationfactory.h
rename to src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h
index 46250245383..b8a40a28194 100644
--- a/src/plugins/qmakeprojectmanager/androidqmakebuildconfigurationfactory.h
+++ b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h
@@ -30,13 +30,12 @@
 #ifndef ANDROIDQMAKEBUILDCONFIGURATIONFACTORY_H
 #define ANDROIDQMAKEBUILDCONFIGURATIONFACTORY_H
 
-#include "qmakebuildconfiguration.h"
+#include <qmakeprojectmanager/qmakebuildconfiguration.h>
 
-namespace QmakeProjectManager {
+namespace QmakeAndroidSupport {
 namespace Internal {
 
-
-class AndroidQmakeBuildConfigurationFactory : public QmakeBuildConfigurationFactory
+class AndroidQmakeBuildConfigurationFactory : public QmakeProjectManager::QmakeBuildConfigurationFactory
 {
 public:
     explicit AndroidQmakeBuildConfigurationFactory(QObject *parent = 0)
diff --git a/src/plugins/qmakeprojectmanager/createandroidmanifestwizard.cpp b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp
similarity index 99%
rename from src/plugins/qmakeprojectmanager/createandroidmanifestwizard.cpp
rename to src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp
index 180616037dc..0dacc4f1afc 100644
--- a/src/plugins/qmakeprojectmanager/createandroidmanifestwizard.cpp
+++ b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp
@@ -51,8 +51,8 @@
 #include <QVBoxLayout>
 
 using namespace Android;
-using namespace QmakeProjectManager;
-using namespace QmakeProjectManager::Internal;
+using namespace QmakeAndroidSupport;
+using namespace QmakeAndroidSupport::Internal;
 
 using QmakeProjectManager::QmakeProject;
 using QmakeProjectManager::QmakeProFileNode;
diff --git a/src/plugins/qmakeprojectmanager/createandroidmanifestwizard.h b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.h
similarity index 98%
rename from src/plugins/qmakeprojectmanager/createandroidmanifestwizard.h
rename to src/plugins/qmakeandroidsupport/createandroidmanifestwizard.h
index e084782c13b..21cfc30ef50 100644
--- a/src/plugins/qmakeprojectmanager/createandroidmanifestwizard.h
+++ b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.h
@@ -40,7 +40,7 @@ QT_END_NAMESPACE
 namespace ProjectExplorer { class Target; }
 namespace QmakeProjectManager { class QmakeProFileNode; }
 
-namespace QmakeProjectManager {
+namespace QmakeAndroidSupport {
 namespace Internal {
 
 class CreateAndroidManifestWizard;
@@ -105,7 +105,7 @@ private:
     QString m_directory;
 };
 
-} //namespace QmakeProjectManager
+} //namespace QmakeAndroidSupport
 } //namespace Internal
 
 #endif // CREATEANDROIDMANIFESTWIZARD_H
diff --git a/src/plugins/qmakeprojectmanager/qmakeandroidbuildapkstep.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp
similarity index 98%
rename from src/plugins/qmakeprojectmanager/qmakeandroidbuildapkstep.cpp
rename to src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp
index 1848a6536bb..62bd44a2c88 100644
--- a/src/plugins/qmakeprojectmanager/qmakeandroidbuildapkstep.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp
@@ -30,8 +30,6 @@
 
 #include "qmakeandroidbuildapkstep.h"
 #include "qmakeandroidbuildapkwidget.h"
-#include "qmakenodes.h"
-#include "qmakeproject.h"
 
 #include <android/androidconfigurations.h>
 #include <android/androidconstants.h>
@@ -43,16 +41,19 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/target.h>
-
 #include <qtsupport/qtkitinformation.h>
+#include <qmakeprojectmanager/qmakenodes.h>
+#include <qmakeprojectmanager/qmakeproject.h>
 
 #include <utils/qtcprocess.h>
 
 #include <QHBoxLayout>
 
 using namespace Android;
+using QmakeProjectManager::QmakeProject;
+using QmakeProjectManager::QmakeProFileNode;
 
-namespace QmakeProjectManager {
+namespace QmakeAndroidSupport {
 namespace Internal {
 
 const Core::Id ANDROID_BUILD_APK_ID("QmakeProjectManager.AndroidBuildApkStep");
diff --git a/src/plugins/qmakeprojectmanager/qmakeandroidbuildapkstep.h b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h
similarity index 98%
rename from src/plugins/qmakeprojectmanager/qmakeandroidbuildapkstep.h
rename to src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h
index c1d4ff44c43..73684f4e304 100644
--- a/src/plugins/qmakeprojectmanager/qmakeandroidbuildapkstep.h
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h
@@ -33,10 +33,9 @@
 
 #include <android/androidbuildapkstep.h>
 
-namespace QmakeProjectManager {
+namespace QmakeAndroidSupport {
 namespace Internal {
 
-
 class QmakeAndroidBuildApkStepFactory : public ProjectExplorer::IBuildStepFactory
 {
     Q_OBJECT
@@ -95,6 +94,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QmakeProjectManager
+} // namespace QmakeAndroidSupport
 
 #endif // QMAKEANDROIDBUILDAPKSTEP_H
diff --git a/src/plugins/qmakeprojectmanager/qmakeandroidbuildapkwidget.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp
similarity index 97%
rename from src/plugins/qmakeprojectmanager/qmakeandroidbuildapkwidget.cpp
rename to src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp
index c6844891f29..d5d9ffbe3b7 100644
--- a/src/plugins/qmakeprojectmanager/qmakeandroidbuildapkwidget.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp
@@ -30,16 +30,19 @@
 #include "createandroidmanifestwizard.h"
 #include "qmakeandroidbuildapkstep.h"
 #include "qmakeandroidbuildapkwidget.h"
-#include "qmakenodes.h"
-#include "qmakeproject.h"
 #include "ui_qmakeandroidbuildapkwidget.h"
 
 #include <android/androidbuildapkwidget.h>
 #include <android/androidmanager.h>
+#include <qmakeprojectmanager/qmakenodes.h>
+#include <qmakeprojectmanager/qmakeproject.h>
 
 #include <QFileDialog>
 
-namespace QmakeProjectManager {
+using QmakeProjectManager::QmakeProject;
+using QmakeProjectManager::QmakeProFileNode;
+
+namespace QmakeAndroidSupport {
 namespace Internal {
 
 QmakeAndroidBuildApkWidget::QmakeAndroidBuildApkWidget(QmakeAndroidBuildApkStep *step) :
diff --git a/src/plugins/qmakeprojectmanager/qmakeandroidbuildapkwidget.h b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.h
similarity index 95%
rename from src/plugins/qmakeprojectmanager/qmakeandroidbuildapkwidget.h
rename to src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.h
index f21db18d887..155d0321e47 100644
--- a/src/plugins/qmakeprojectmanager/qmakeandroidbuildapkwidget.h
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.h
@@ -40,9 +40,9 @@ QT_BEGIN_NAMESPACE
 class QLabel;
 QT_END_NAMESPACE
 
-namespace QmakeProjectManager {
-class QmakeBuildConfiguration;
+namespace QmakeProjectManager { class QmakeBuildConfiguration; }
 
+namespace QmakeAndroidSupport {
 namespace Internal {
 
 namespace Ui {
@@ -80,6 +80,6 @@ public:
 };
 
 } // namespace Internal
-} // namespace QmakeProjectManager
+} // namespace QmakeAndroidSupport
 
 #endif // QMAKEANDROIDBUILDAPKWIDGET_H
diff --git a/src/plugins/qmakeprojectmanager/qmakeandroidbuildapkwidget.ui b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.ui
similarity index 97%
rename from src/plugins/qmakeprojectmanager/qmakeandroidbuildapkwidget.ui
rename to src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.ui
index c92178da0fa..9e40690678e 100644
--- a/src/plugins/qmakeprojectmanager/qmakeandroidbuildapkwidget.ui
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>QmakeProjectManager::Internal::QmakeAndroidBuildApkWidget</class>
- <widget class="QWidget" name="QmakeProjectManager::Internal::QmakeAndroidBuildApkWidget">
+ <class>QmakeAndroidSupport::Internal::QmakeAndroidBuildApkWidget</class>
+ <widget class="QWidget" name="QmakeAndroidSupport::Internal::QmakeAndroidBuildApkWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/plugins/qmakeprojectmanager/qmakeandroidrunconfiguration.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
similarity index 99%
rename from src/plugins/qmakeprojectmanager/qmakeandroidrunconfiguration.cpp
rename to src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
index 83bca386d0e..76d2012a795 100644
--- a/src/plugins/qmakeprojectmanager/qmakeandroidrunconfiguration.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
@@ -45,7 +45,7 @@ namespace {
 using namespace ProjectExplorer;
 using QmakeProjectManager::QmakeProject;
 
-namespace QmakeProjectManager {
+namespace QmakeAndroidSupport {
 namespace Internal {
 
 QmakeAndroidRunConfiguration::QmakeAndroidRunConfiguration(Target *parent, Core::Id id, const QString &path)
diff --git a/src/plugins/qmakeprojectmanager/qmakeandroidrunconfiguration.h b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h
similarity index 95%
rename from src/plugins/qmakeprojectmanager/qmakeandroidrunconfiguration.h
rename to src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h
index 612c78957d5..c9cbe278d57 100644
--- a/src/plugins/qmakeprojectmanager/qmakeandroidrunconfiguration.h
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h
@@ -32,9 +32,9 @@
 
 #include <android/androidrunconfiguration.h>
 
-namespace QmakeProjectManager {
-class QmakeProFileNode;
+namespace QmakeProjectManager { class QmakeProFileNode; }
 
+namespace QmakeAndroidSupport {
 namespace Internal {
 
 class QmakeAndroidRunConfiguration : public Android::AndroidRunConfiguration
@@ -68,6 +68,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Android
+} // namespace QmakeAndroidSupport
 
 #endif // QMAKE_ANDROIDRUNCONFIGURATION_H
diff --git a/src/plugins/qmakeprojectmanager/qmakeandroidrunfactories.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
similarity index 98%
rename from src/plugins/qmakeprojectmanager/qmakeandroidrunfactories.cpp
rename to src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
index 83746dc7bbd..ab073dd0393 100644
--- a/src/plugins/qmakeprojectmanager/qmakeandroidrunfactories.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
@@ -42,11 +42,11 @@
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
 
-
 using namespace Android;
 using namespace ProjectExplorer;
+using namespace QmakeProjectManager;
 
-namespace QmakeProjectManager {
+namespace QmakeAndroidSupport {
 namespace Internal {
 
 static const char ANDROID_RC_ID_PREFIX[] = "Qt4ProjectManager.AndroidRunConfiguration:";
diff --git a/src/plugins/qmakeprojectmanager/qmakeandroidrunfactories.h b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h
similarity index 97%
rename from src/plugins/qmakeprojectmanager/qmakeandroidrunfactories.h
rename to src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h
index e0a74af2e05..058aabfba30 100644
--- a/src/plugins/qmakeprojectmanager/qmakeandroidrunfactories.h
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h
@@ -41,7 +41,7 @@ class Target;
 class Node;
 } // namespace ProjectExplorer
 
-namespace QmakeProjectManager {
+namespace QmakeAndroidSupport {
 namespace Internal {
 
 class QmakeAndroidRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory
@@ -73,6 +73,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Android
+} // namespace QmakeAndroidSupport
 
 #endif  // ANDROIDRUNFACTORIES_H
diff --git a/src/plugins/qmakeprojectmanager/qmakeandroidsupport.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
similarity index 95%
rename from src/plugins/qmakeprojectmanager/qmakeandroidsupport.cpp
rename to src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
index 1267e9e3b08..52542b8cd85 100644
--- a/src/plugins/qmakeprojectmanager/qmakeandroidsupport.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
@@ -29,10 +29,6 @@
 
 #include "androidpackageinstallationstep.h"
 #include "qmakeandroidsupport.h"
-#include "qmakebuildconfiguration.h"
-#include "qmakenodes.h"
-#include "qmakeproject.h"
-#include "qmakestep.h"
 
 #include <android/androidconstants.h>
 #include <projectexplorer/buildmanager.h>
@@ -42,8 +38,14 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 #include <qtsupport/qtkitinformation.h>
+#include <qmakeprojectmanager/qmakebuildconfiguration.h>
+#include <qmakeprojectmanager/qmakenodes.h>
+#include <qmakeprojectmanager/qmakeproject.h>
+#include <qmakeprojectmanager/qmakestep.h>
 
-namespace QmakeProjectManager {
+using namespace QmakeProjectManager;
+
+namespace QmakeAndroidSupport {
 namespace Internal {
 
 bool QmakeAndroidSupport::canHandle(const ProjectExplorer::Target *target) const
diff --git a/src/plugins/qmakeprojectmanager/qmakeandroidsupport.h b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h
similarity index 98%
rename from src/plugins/qmakeprojectmanager/qmakeandroidsupport.h
rename to src/plugins/qmakeandroidsupport/qmakeandroidsupport.h
index e2439173dd1..3c13f6065a3 100644
--- a/src/plugins/qmakeprojectmanager/qmakeandroidsupport.h
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h
@@ -32,7 +32,7 @@
 
 #include <android/androidqtsupport.h>
 
-namespace QmakeProjectManager {
+namespace QmakeAndroidSupport {
 namespace Internal {
 
 class QmakeAndroidSupport : public Android::AndroidQtSupport
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.pro b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.pro
new file mode 100644
index 00000000000..04a8cae51a5
--- /dev/null
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.pro
@@ -0,0 +1,36 @@
+QT += network
+include(../../qtcreatorplugin.pri)
+
+DEFINES += \
+    QMAKEANDROID_LIBRARY
+
+HEADERS += \
+    androidextralibrarylistmodel.h \
+    androidpackageinstallationfactory.h \
+    androidpackageinstallationstep.h \
+    createandroidmanifestwizard.h \
+    qmakeandroidsupport.h \
+    qmakeandroidrunconfiguration.h \
+    qmakeandroidrunfactories.h \
+    qmakeandroidbuildapkstep.h \
+    qmakeandroidbuildapkwidget.h \
+    androidqmakebuildconfigurationfactory.h \
+    qmakeandroidsupportplugin.h
+
+SOURCES += \
+    androidextralibrarylistmodel.cpp \
+    androidpackageinstallationfactory.cpp \
+    androidpackageinstallationstep.cpp \
+    createandroidmanifestwizard.cpp \
+    qmakeandroidsupport.cpp \
+    qmakeandroidrunconfiguration.cpp \
+    qmakeandroidrunfactories.cpp \
+    qmakeandroidbuildapkstep.cpp \
+    qmakeandroidbuildapkwidget.cpp \
+    androidqmakebuildconfigurationfactory.cpp \
+    qmakeandroidsupportplugin.cpp
+
+FORMS += qmakeandroidbuildapkwidget.ui
+
+RESOURCES +=
+
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupport_dependencies.pri b/src/plugins/qmakeandroidsupport/qmakeandroidsupport_dependencies.pri
new file mode 100644
index 00000000000..dc7c706fa65
--- /dev/null
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport_dependencies.pri
@@ -0,0 +1,16 @@
+QTC_PLUGIN_NAME = QmakeAndroidSupport
+QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
+    qmljs \
+    utils
+QTC_PLUGIN_DEPENDS += \
+    coreplugin \
+    projectexplorer \
+    qtsupport \
+    texteditor \
+    cpptools \
+    qmljstools \
+    resourceeditor \
+    android \
+    qmakeprojectmanager
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupport_global.h b/src/plugins/qmakeandroidsupport/qmakeandroidsupport_global.h
new file mode 100644
index 00000000000..cf2d1436e7c
--- /dev/null
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport_global.h
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef QMAKEANDROID_GLOBAL_H
+#define QMAKEANDROID_GLOBAL_H
+
+#include <qglobal.h>
+
+#if defined(QMAKEANDROID_LIBRARY)
+#  define QMAKEANDROIDSUPPORT_EXPORT Q_DECL_EXPORT
+#else
+#  define QMAKEANDROIDSUPPORT_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // QMAKEANDROID_GLOBAL_H
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.cpp
new file mode 100644
index 00000000000..d0dc3cf4e65
--- /dev/null
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.cpp
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "qmakeandroidsupportplugin.h"
+
+#include "androidpackageinstallationfactory.h"
+#include "androidqmakebuildconfigurationfactory.h"
+#include "qmakeandroidbuildapkstep.h"
+#include "qmakeandroidrunfactories.h"
+#include "qmakeandroidsupport.h"
+
+#include <coreplugin/icore.h>
+
+#include <QtPlugin>
+
+using namespace QmakeAndroidSupport::Internal;
+using namespace QmakeAndroidSupport;
+
+QmakeAndroidSupportPlugin::QmakeAndroidSupportPlugin()
+{
+
+}
+
+QmakeAndroidSupportPlugin::~QmakeAndroidSupportPlugin()
+{
+}
+
+bool QmakeAndroidSupportPlugin::initialize(const QStringList &arguments, QString *errorMessage)
+{
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorMessage)
+    addAutoReleasedObject(new AndroidQmakeBuildConfigurationFactory);
+    addAutoReleasedObject(new AndroidPackageInstallationFactory);
+    addAutoReleasedObject(new QmakeAndroidBuildApkStepFactory);
+    addAutoReleasedObject(new QmakeAndroidRunConfigurationFactory);
+    addAutoReleasedObject(new QmakeAndroidSupport);
+
+    return true;
+}
+
+void QmakeAndroidSupportPlugin::extensionsInitialized()
+{ }
+
+Q_EXPORT_PLUGIN(QmakeAndroidSupportPlugin)
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.h b/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.h
new file mode 100644
index 00000000000..3f46fcc7c63
--- /dev/null
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.h
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef QMAKEANDROIDSUPPORTPLUGIN_H
+#define QMAKEANDROIDSUPPORTPLUGIN_H
+
+#include <extensionsystem/iplugin.h>
+
+namespace QmakeAndroidSupport {
+namespace Internal {
+
+class QmakeAndroidSupportPlugin : public ExtensionSystem::IPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "QmakeAndroidSupport.json")
+
+public:
+    QmakeAndroidSupportPlugin();
+    ~QmakeAndroidSupportPlugin();
+    bool initialize(const QStringList &arguments, QString *errorMessage);
+    void extensionsInitialized();
+};
+
+} // namespace Internal
+} // namespace QmakeAndroidSupport
+
+#endif // QMAKEANDROIDSUPPORTPLUGIN_H
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro
index b8295e91883..db881dfdd67 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro
@@ -5,10 +5,6 @@ DEFINES += \
     QMAKEPROJECTMANAGER_LIBRARY
 
 HEADERS += \
-    androidextralibrarylistmodel.h \
-    androidpackageinstallationfactory.h \
-    androidpackageinstallationstep.h \
-    createandroidmanifestwizard.h \
     qmakebuildinfo.h \
     qmakekitinformation.h \
     qmakekitconfigwidget.h \
@@ -58,19 +54,9 @@ HEADERS += \
     findqmakeprofiles.h \
     qmakeprojectmanager_global.h \
     desktopqmakerunconfiguration.h \
-    profilecompletionassist.h \
-    qmakeandroidsupport.h \
-    qmakeandroidrunconfiguration.h \
-    qmakeandroidrunfactories.h \
-    qmakeandroidbuildapkstep.h \
-    qmakeandroidbuildapkwidget.h \
-    androidqmakebuildconfigurationfactory.h
+    profilecompletionassist.h
 
 SOURCES += \
-    androidextralibrarylistmodel.cpp \
-    androidpackageinstallationfactory.cpp \
-    androidpackageinstallationstep.cpp \
-    createandroidmanifestwizard.cpp \
     qmakekitconfigwidget.cpp \
     qmakekitinformation.cpp \
     qmakeprojectimporter.cpp \
@@ -118,19 +104,12 @@ SOURCES += \
     findqmakeprofiles.cpp \
     desktopqmakerunconfiguration.cpp \
     profilecompletionassist.cpp \
-    qmakeandroidsupport.cpp \
-    qmakeandroidrunconfiguration.cpp \
-    qmakeandroidrunfactories.cpp \
-    qmakeandroidbuildapkstep.cpp \
-    qmakeandroidbuildapkwidget.cpp \
-    androidqmakebuildconfigurationfactory.cpp
 
 FORMS += makestep.ui \
     qmakestep.ui \
     qmakeprojectconfigwidget.ui \
     librarydetailswidget.ui \
-    wizards/testwizardpage.ui \
-    qmakeandroidbuildapkwidget.ui
+    wizards/testwizardpage.ui
 
 RESOURCES += qmakeprojectmanager.qrc \
     wizards/wizards.qrc
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager_dependencies.pri b/src/plugins/qmakeprojectmanager/qmakeprojectmanager_dependencies.pri
index 07f17bee567..18012c35d5e 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager_dependencies.pri
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager_dependencies.pri
@@ -11,8 +11,7 @@ QTC_PLUGIN_DEPENDS += \
     texteditor \
     cpptools \
     qmljstools \
-    resourceeditor \
-    android
+    resourceeditor
 
 QTC_PLUGIN_RECOMMENDS += \
     designer
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
index 46339960372..83df8908f64 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
@@ -27,11 +27,6 @@
 **
 ****************************************************************************/
 
-#include "androidpackageinstallationfactory.h"
-#include "androidqmakebuildconfigurationfactory.h"
-#include "qmakeandroidbuildapkstep.h"
-#include "qmakeandroidrunfactories.h"
-#include "qmakeandroidsupport.h"
 #include "qmakeprojectmanagerplugin.h"
 
 #include "qmakeprojectmanager.h"
@@ -138,7 +133,6 @@ bool QmakeProjectManagerPlugin::initialize(const QStringList &arguments, QString
     addAutoReleasedObject(new MakeStepFactory);
 
     addAutoReleasedObject(new QmakeBuildConfigurationFactory);
-    addAutoReleasedObject(new AndroidQmakeBuildConfigurationFactory);
     addAutoReleasedObject(new DesktopQmakeRunConfigurationFactory);
 
     if (Utils::HostOsInfo::isMacHost())
@@ -158,12 +152,6 @@ bool QmakeProjectManagerPlugin::initialize(const QStringList &arguments, QString
     hf->addMimeType(QmakeProjectManager::Constants::PROFEATUREFILE_MIMETYPE);
     addAutoReleasedObject(hf);
 
-    // Android stuff
-    addAutoReleasedObject(new AndroidPackageInstallationFactory);
-    addAutoReleasedObject(new QmakeAndroidBuildApkStepFactory);
-    addAutoReleasedObject(new QmakeAndroidRunConfigurationFactory);
-    addAutoReleasedObject(new QmakeAndroidSupport);
-
     //menus
     Core::ActionContainer *mbuild =
             Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_BUILDPROJECT);