diff --git a/src/plugins/android/androiddeploystep.cpp b/src/plugins/android/androiddeploystep.cpp
index 8b5e976db7d..01e2e084b81 100644
--- a/src/plugins/android/androiddeploystep.cpp
+++ b/src/plugins/android/androiddeploystep.cpp
@@ -573,7 +573,7 @@ bool AndroidDeployStep::deployPackage()
 void AndroidDeployStep::raiseError(const QString &errorString)
 {
     emit addTask(Task(Task::Error, errorString, Utils::FileName::fromString(QString()), -1,
-        ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
+        ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT));
 }
 
 void AndroidDeployStep::writeOutput(const QString &text, OutputFormat format)
diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp
index dc7965a7cfa..c5e9fe8e1bf 100644
--- a/src/plugins/android/androidpackagecreationstep.cpp
+++ b/src/plugins/android/androidpackagecreationstep.cpp
@@ -892,7 +892,7 @@ void AndroidPackageCreationStep::raiseError(const QString &shortMsg,
 {
     emit addOutput(detailedMsg.isNull() ? shortMsg : detailedMsg, BuildStep::ErrorOutput);
     emit addTask(Task(Task::Error, shortMsg, Utils::FileName::fromString(QString()), -1,
-                      TASK_CATEGORY_BUILDSYSTEM));
+                      TASK_CATEGORY_DEPLOYMENT));
 }
 
 const Core::Id AndroidPackageCreationStep::CreatePackageId("Qt4ProjectManager.AndroidPackageCreationStep");
diff --git a/src/plugins/madde/maemopackagecreationstep.cpp b/src/plugins/madde/maemopackagecreationstep.cpp
index d87f1aede22..ef120b7bea6 100644
--- a/src/plugins/madde/maemopackagecreationstep.cpp
+++ b/src/plugins/madde/maemopackagecreationstep.cpp
@@ -352,7 +352,7 @@ void MaemoDebianPackageCreationStep::checkProjectName()
                "Debian packages.\nThey must only use lower-case letters, "
                "numbers, '-', '+' and '.'.\n""We will try to work around that, "
                "but you may experience problems."),
-            FileName(), -1, Core::Id(TASK_CATEGORY_BUILDSYSTEM)));
+            FileName(), -1, Core::Id(TASK_CATEGORY_DEPLOYMENT)));
     }
 }
 
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 5ee8e22914d..b686121305c 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -146,10 +146,12 @@ BuildManager::BuildManager(ProjectExplorerPlugin *parent, QAction *cancelBuildAc
 
 void BuildManager::extensionsInitialized()
 {
-    TaskHub::addCategory(Core::Id(Constants::TASK_CATEGORY_COMPILE),
+    TaskHub::addCategory(Constants::TASK_CATEGORY_COMPILE,
                          tr("Compile", "Category for compiler issues listed under 'Issues'"));
-    TaskHub::addCategory(Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM),
+    TaskHub::addCategory(Constants::TASK_CATEGORY_BUILDSYSTEM,
                          tr("Build System", "Category for build system issues listed under 'Issues'"));
+    TaskHub::addCategory(Constants::TASK_CATEGORY_DEPLOYMENT,
+                         tr("Deployment", "Category for deployment issues listed under 'Issues'"));
 }
 
 BuildManager::~BuildManager()
@@ -185,8 +187,9 @@ bool BuildManager::isBuilding() const
 int BuildManager::getErrorTaskCount() const
 {
     const int errors =
-            d->m_taskWindow->errorTaskCount(Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM))
-            + d->m_taskWindow->errorTaskCount(Core::Id(Constants::TASK_CATEGORY_COMPILE));
+            d->m_taskWindow->errorTaskCount(Constants::TASK_CATEGORY_BUILDSYSTEM)
+            + d->m_taskWindow->errorTaskCount(Constants::TASK_CATEGORY_COMPILE)
+            + d->m_taskWindow->errorTaskCount(Constants::TASK_CATEGORY_DEPLOYMENT);
     return errors;
 }
 
@@ -273,8 +276,9 @@ void BuildManager::toggleTaskWindow()
 bool BuildManager::tasksAvailable() const
 {
     const int count =
-            d->m_taskWindow->taskCount(Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM))
-            + d->m_taskWindow->taskCount(Core::Id(Constants::TASK_CATEGORY_COMPILE));
+            d->m_taskWindow->taskCount(Constants::TASK_CATEGORY_BUILDSYSTEM)
+            + d->m_taskWindow->taskCount(Constants::TASK_CATEGORY_COMPILE)
+            + d->m_taskWindow->taskCount(Constants::TASK_CATEGORY_DEPLOYMENT);
     return count > 0;
 }
 
@@ -293,8 +297,9 @@ void BuildManager::startBuildQueue(const QStringList &preambleMessage)
         d->m_outputWindow->clearContents();
         foreach (const QString &str, preambleMessage)
             addToOutputWindow(str, BuildStep::MessageOutput, BuildStep::DontAppendNewline);
-        TaskHub::clearTasks(Core::Id(Constants::TASK_CATEGORY_COMPILE));
-        TaskHub::clearTasks(Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM));
+        TaskHub::clearTasks(Constants::TASK_CATEGORY_COMPILE);
+        TaskHub::clearTasks(Constants::TASK_CATEGORY_BUILDSYSTEM);
+        TaskHub::clearTasks(Constants::TASK_CATEGORY_DEPLOYMENT);
         progressManager->setApplicationLabel(QString());
         d->m_futureProgress = progressManager->addTask(d->m_progressFutureInterface->future(),
               QString(),
diff --git a/src/plugins/projectexplorer/buildprogress.cpp b/src/plugins/projectexplorer/buildprogress.cpp
index 9a6a673a0fd..a2845bfed45 100644
--- a/src/plugins/projectexplorer/buildprogress.cpp
+++ b/src/plugins/projectexplorer/buildprogress.cpp
@@ -97,14 +97,16 @@ void BuildProgress::updateState()
 {
     if (!m_taskWindow)
         return;
-    int errors = m_taskWindow->errorTaskCount(Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM))
-            + m_taskWindow->errorTaskCount(Core::Id(Constants::TASK_CATEGORY_COMPILE));
+    int errors = m_taskWindow->errorTaskCount(Constants::TASK_CATEGORY_BUILDSYSTEM)
+            + m_taskWindow->errorTaskCount(Constants::TASK_CATEGORY_COMPILE)
+            + m_taskWindow->errorTaskCount(Constants::TASK_CATEGORY_DEPLOYMENT);
     bool haveErrors = (errors > 0);
     m_errorIcon->setEnabled(haveErrors);
     m_errorLabel->setEnabled(haveErrors);
     m_errorLabel->setText(QString::number(errors));
-    int warnings = m_taskWindow->warningTaskCount(Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM))
-            + m_taskWindow->warningTaskCount(Core::Id(Constants::TASK_CATEGORY_COMPILE));
+    int warnings = m_taskWindow->warningTaskCount(Constants::TASK_CATEGORY_BUILDSYSTEM)
+            + m_taskWindow->warningTaskCount(Constants::TASK_CATEGORY_COMPILE)
+            + m_taskWindow->warningTaskCount(Constants::TASK_CATEGORY_DEPLOYMENT);
     bool haveWarnings = (warnings > 0);
     m_warningIcon->setEnabled(haveWarnings);
     m_warningLabel->setEnabled(haveWarnings);
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index e68ae893f43..1f3f5a5dcef 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -188,6 +188,7 @@ const char DEVICE_SETTINGS_PAGE_ID[] = "AA.Device Settings";
 // Task categories
 const char TASK_CATEGORY_COMPILE[] = "Task.Category.Compile";
 const char TASK_CATEGORY_BUILDSYSTEM[] = "Task.Category.Buildsystem";
+const char TASK_CATEGORY_DEPLOYMENT[] = "Task.Category.Deploy";
 
 // Wizard categories
 const char QT_PROJECT_WIZARD_CATEGORY[] = "H.QtProjects";
diff --git a/src/plugins/qnx/blackberryabstractdeploystep.cpp b/src/plugins/qnx/blackberryabstractdeploystep.cpp
index 8b4b0252b30..6ca54a054e5 100644
--- a/src/plugins/qnx/blackberryabstractdeploystep.cpp
+++ b/src/plugins/qnx/blackberryabstractdeploystep.cpp
@@ -186,7 +186,7 @@ void BlackBerryAbstractDeployStep::raiseError(const QString &errorMessage)
 {
     emit addOutput(errorMessage, BuildStep::ErrorMessageOutput);
     emit addTask(ProjectExplorer::Task(ProjectExplorer::Task::Error, errorMessage, Utils::FileName(), -1,
-                                       Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
+                                       ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT));
 }
 
 void BlackBerryAbstractDeployStep::processReadyReadStdOutput()
diff --git a/src/plugins/remotelinux/abstractpackagingstep.cpp b/src/plugins/remotelinux/abstractpackagingstep.cpp
index 688663ead85..05612e0ccff 100644
--- a/src/plugins/remotelinux/abstractpackagingstep.cpp
+++ b/src/plugins/remotelinux/abstractpackagingstep.cpp
@@ -170,7 +170,7 @@ void AbstractPackagingStep::raiseError(const QString &errorMessage)
 {
     emit addOutput(errorMessage, BuildStep::ErrorOutput);
     emit addTask(Task(Task::Error, errorMessage, Utils::FileName(), -1,
-                      Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)));
+                      Constants::TASK_CATEGORY_DEPLOYMENT));
 }
 
 } // namespace RemoteLinux
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
index a52db4941e2..86d40e9d02a 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
@@ -132,7 +132,7 @@ void AbstractRemoteLinuxDeployStep::handleErrorMessage(const QString &message)
 {
     emit addOutput(message, ErrorMessageOutput);
     emit addTask(Task(Task::Error, message, Utils::FileName(), -1,
-                      Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)));
+                      Constants::TASK_CATEGORY_DEPLOYMENT));
     d->hasError = true;
 }
 
@@ -140,7 +140,7 @@ void AbstractRemoteLinuxDeployStep::handleWarningMessage(const QString &message)
 {
     emit addOutput(message, ErrorMessageOutput);
     emit addTask(Task(Task::Warning, message, Utils::FileName(), -1,
-                      Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)));
+                      Constants::TASK_CATEGORY_DEPLOYMENT));
 }
 
 void AbstractRemoteLinuxDeployStep::handleFinished()