diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index dd568b05848..de9742e0e4e 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -233,7 +233,7 @@ QString CMakeProject::buildParser(const QString &buildConfiguration) const
 QStringList CMakeProject::targets() const
 {
     QStringList results;
-    foreach(const CMakeTarget &ct, m_targets)
+    foreach (const CMakeTarget &ct, m_targets)
         results << ct.title;
     return results;
 }
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h
index aa04fb431aa..02a1995306f 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.h
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.h
@@ -44,7 +44,7 @@
 #include <QtCore/QXmlStreamReader>
 
 namespace CMakeProjectManager {
-namespace Internal{
+namespace Internal {
 
 class CMakeFile;
 
diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp
index 80a3463f35a..cc56f3a13d9 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.cpp
+++ b/src/plugins/genericprojectmanager/genericmakestep.cpp
@@ -32,6 +32,7 @@
 #include "genericproject.h"
 
 #include <extensionsystem/pluginmanager.h>
+#include <projectexplorer/toolchain.h>
 #include <utils/qtcassert.h>
 
 #include <QtGui/QFormLayout>
@@ -97,11 +98,10 @@ bool GenericMakeStep::init(const QString &buildConfiguration)
 
     setEnabled(buildConfiguration, true);
     setWorkingDirectory(buildConfiguration, m_pro->buildDirectory(buildConfiguration));
-#ifdef Q_OS_WIN
-    setCommand(buildConfiguration, "mingw32-make");
-#else // Q_OS_WIN
-    setCommand(buildConfiguration, "make"); // TODO give full path here?
-#endif // Q_OS_WIN
+    if (ProjectExplorer::ToolChain *toolChain = m_pro->toolChain())
+        setCommand(buildConfiguration, toolChain->makeCommand());
+    else
+        setCommand(buildConfiguration, "make");
     setArguments(buildConfiguration, value(buildConfiguration, "buildTargets").toStringList()); // TODO
     setEnvironment(buildConfiguration, m_pro->environment(buildConfiguration));
     return AbstractProcessStep::init(buildConfiguration);
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index ceb64c9c879..9070dabd5ce 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -55,6 +55,10 @@ using namespace GenericProjectManager::Internal;
 
 namespace {
 
+/**
+ * An editable string list model. New strings can be added by editing the entry
+ * called "<new>", displayed at the end.
+ */
 class ListModel: public QStringListModel
 {
 public:
@@ -320,6 +324,11 @@ QString GenericProject::buildParser(const QString &buildConfiguration) const
     return QString();
 }
 
+ProjectExplorer::ToolChain *GenericProject::toolChain() const
+{
+    return m_toolChain;
+}
+
 QString GenericProject::toolChainId() const
 { return m_toolChainId; }
 
diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h
index e1401ea2f32..a5f4abb7fb6 100644
--- a/src/plugins/genericprojectmanager/genericproject.h
+++ b/src/plugins/genericprojectmanager/genericproject.h
@@ -50,6 +50,10 @@ class PathChooser;
 }
 }
 
+namespace ProjectExplorer {
+class ToolChain;
+}
+
 namespace GenericProjectManager {
 namespace Internal {
 
@@ -89,8 +93,7 @@ public:
     QStringList targets() const;
     GenericMakeStep *makeStep() const;
     QString buildParser(const QString &buildConfiguration) const;
-
-    QStringList convertToAbsoluteFiles(const QStringList &paths) const;
+    ProjectExplorer::ToolChain *toolChain() const;
 
     QStringList includePaths() const;
     void setIncludePaths(const QStringList &includePaths);
@@ -112,6 +115,7 @@ protected:
 
 private:
     void parseProject();
+    QStringList convertToAbsoluteFiles(const QStringList &paths) const;
 
     QStringList readLines(const QString &absoluteFileName) const;