diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
index ca079ad4ba1..d684f36f703 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
@@ -256,7 +256,7 @@ public class Configuration extends BuildObject implements IConfiguration {
 		
 		PropertyManager mngr = PropertyManager.getInstance();
 		String rebuild = mngr.getProperty(this, REBUILD_STATE);
-		if(rebuild == null || Boolean.parseBoolean(rebuild))
+		if(rebuild == null || Boolean.valueOf(rebuild).booleanValue())
 			rebuildNeeded = true;
 		
 		String rcChangeState = mngr.getProperty(this, RC_CHANGE_STATE);
@@ -270,10 +270,10 @@ public class Configuration extends BuildObject implements IConfiguration {
 			}
 		}
 		
-		internalBuilderEnabled = Boolean.parseBoolean(
-				mngr.getProperty(this, INTERNAL_BUILDER_ENABLED));
+		internalBuilderEnabled = Boolean.valueOf(
+				mngr.getProperty(this, INTERNAL_BUILDER_ENABLED)).booleanValue();
 		String tmp = mngr.getProperty(this, INTERNAL_BUILDER_IGNORE_ERR);
-		if(tmp == null || Boolean.parseBoolean(tmp))
+		if(tmp == null || Boolean.valueOf(tmp).booleanValue())
 			internalBuilderIgnoreErr = true;
 	}
 
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java
index dd76775c3d0..1bff6fb8f5e 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java
@@ -117,7 +117,7 @@ public class ResourceConfiguration extends BuildObject implements IResourceConfi
 		}
 		
 		String rebuild = PropertyManager.getInstance().getProperty(this, REBUILD_STATE);
-		if(rebuild == null || Boolean.parseBoolean(rebuild))
+		if(rebuild == null || Boolean.valueOf(rebuild).booleanValue())
 			rebuildState = true;
 	}
 	
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
index f6277388c1a..76187fa8578 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
@@ -296,7 +296,7 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory {
 		}
 		
 		String rebuild = PropertyManager.getInstance().getProperty(this, REBUILD_STATE);
-		if(rebuild == null || Boolean.parseBoolean(rebuild))
+		if(rebuild == null || Boolean.valueOf(rebuild).booleanValue())
 			rebuildState = true;
 
 	}
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java
index 859d6da2094..214d941bd7c 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java
@@ -238,7 +238,7 @@ public class ToolChain extends HoldsOptions implements IToolChain {
 		}
 		
 		String rebuild = PropertyManager.getInstance().getProperty(this, REBUILD_STATE);
-		if(rebuild == null || Boolean.parseBoolean(rebuild))
+		if(rebuild == null || Boolean.valueOf(rebuild).booleanValue())
 			rebuildState = true;
 
 	}