diff --git a/src/Main/Base/Project/Src/Project/BuildOptions.cs b/src/Main/Base/Project/Src/Project/BuildOptions.cs
index abb845be6a..4151d06189 100644
--- a/src/Main/Base/Project/Src/Project/BuildOptions.cs
+++ b/src/Main/Base/Project/Src/Project/BuildOptions.cs
@@ -61,7 +61,7 @@ namespace ICSharpCode.SharpDevelop.Project
public static int DefaultParallelProjectCount {
get {
- return PropertyService.Get("SharpDevelop.BuildParallelProjectCount", Environment.ProcessorCount);
+ return PropertyService.Get("SharpDevelop.BuildParallelProjectCount", Environment.ProcessorCount >= 2 ? 2: 1);
}
set {
PropertyService.Set("SharpDevelop.BuildParallelProjectCount", value);
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index b7030722ad..1ed646239c 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -501,6 +501,10 @@
+
+
+
+
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index 88d5765eac..6115e363fe 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -173,6 +173,7 @@
+