diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IResourceInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IResourceInfo.java
index 32022e641ef..1a412632659 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IResourceInfo.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IResourceInfo.java
@@ -108,4 +108,6 @@ public interface IResourceInfo extends IBuildObject {
 
 	public IOption setOption(IHoldsOptions parent, IOption option, OptionStringValue[] value)
 		throws BuildException;
+	
+	boolean isSupported();
 }
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 63fa349ac67..ee5f6e43c5c 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
@@ -1619,9 +1619,9 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#isSupported()
 	 */
 	public boolean isSupported(){
-		IToolChain toolChain = getToolChain();
-		if(toolChain != null)
-			return toolChain.isSupported();
+		IFolderInfo foInfo = getRootFolderInfo();
+		if(foInfo != null)
+			return foInfo.isSupported();
 		return false;
 	}
 	
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
index 4a94ed20c70..11b740e6431 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
@@ -1574,4 +1574,10 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
 		
 		setRebuildState(true);
 	}
+	
+	public boolean isSupported(){
+		if(toolChain != null)
+			return toolChain.isSupported();
+		return false;
+	}
 }
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 58dd160199b..9ce55f3e18e 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
@@ -25,6 +25,7 @@ import org.eclipse.cdt.core.settings.model.extension.CLanguageData;
 import org.eclipse.cdt.managedbuilder.core.IBuildObject;
 import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.core.IFileInfo;
+import org.eclipse.cdt.managedbuilder.core.IFolderInfo;
 import org.eclipse.cdt.managedbuilder.core.IHoldsOptions;
 import org.eclipse.cdt.managedbuilder.core.IManagedConfigElement;
 import org.eclipse.cdt.managedbuilder.core.IOption;
@@ -1030,4 +1031,18 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 		
 		setRebuildState(true);
 	}
+	
+	public boolean isSupported(){
+		IFolderInfo foInfo = getParentFolderInfo();
+		if(foInfo == null){
+			IConfiguration cfg = getParent();
+			if(cfg != null) {
+				foInfo = cfg.getRootFolderInfo();
+			}
+		}
+		
+		if(foInfo != null)
+			return foInfo.isSupported();
+		return false;
+	}
 }
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/util/TestFolderInfo.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/util/TestFolderInfo.java
index cd6675d6be4..eced6149ef5 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/util/TestFolderInfo.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/util/TestFolderInfo.java
@@ -243,4 +243,9 @@ public class TestFolderInfo implements IFolderInfo {
 		return null;
 	}
 
+	public boolean isSupported() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
 }