diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index e05614029c3..455c6e87095 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -500,7 +500,7 @@ void CMakeProject::setUserEnvironmentChanges(const QString &buildConfig, const Q
     QStringList list = EnvironmentItem::toStringList(diff);
     if (list == value(buildConfig, "userEnvironmentChanges"))
         return;
-    setValue(buildConfig, "userEnvironmentChanges", EnvironmentItem::toStringList(diff));
+    setValue(buildConfig, "userEnvironmentChanges", list);
     emit environmentChanged(buildConfig);
 }
 
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index a766a1e5a8b..e3b7757881e 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -58,7 +58,13 @@ void AbstractProcessStep::setCommand(const QString &buildConfiguration, const QS
 
 QString AbstractProcessStep::command(const QString &buildConfiguration) const
 {
-    return value(buildConfiguration, PROCESS_COMMAND).toString();
+    QString result = value(buildConfiguration, PROCESS_COMMAND).toString();
+    if (QFileInfo(result).isRelative()) {
+        QString searchInPath = environment(buildConfiguration).searchInPath(result);
+        if (!searchInPath.isEmpty())
+            result = searchInPath;
+    }
+    return result;
 }
 
 void AbstractProcessStep::setWorkingDirectory(const QString &buildConfiguration, const QString &workingDirectory)