diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
index ba6d1d938d1..ada08ff381a 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
@@ -2677,7 +2677,32 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI
 					}
 				}
 			}
+			
+			// walk through each resource configuration and look if there are any converters
+			// available. If so, invoke them.
+			IResourceConfiguration [] resourceConfigs = configuration.getResourceConfigurations();
+			if ( ( resourceConfigs != null) && ( resourceConfigs.length > 0)) {
+				for (int j = 0; j < resourceConfigs.length; j++) {
+					IResourceConfiguration resConfig = resourceConfigs[j];
+					ITool [] resTools = resConfig.getTools();
+					for (int k = 0; k < resTools.length; k++) {
+						ITool resTool = resTools[k];
+						if (forCurrentMbsVersion) {
+							element = ((Tool)resTool).getCurrentMbsVersionConversionElement();
+						} else {
+							element = ((Tool)resTool).getPreviousMbsVersionConversionElement();
+						}
+						if (element != null) {
+							if ( invokeConverter(resTool, element) == null ) {
+								buildInfo.getManagedProject().setValid(false);
+								return false;
+							}
+						}
+					}
+				}
+			}   // end of if			
 		}		
+		
 		// If control comes here, it means either there is no converter element
 		// or converters are invoked successfully
 		return 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 47a146ca2ef..a065a2fbb6c 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
@@ -570,11 +570,12 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory {
 				IResourceConfiguration resConfig = (IResourceConfiguration) getParent();
 				setSuperClass( resConfig.getParent().getTool(superClassId) );
 			} else {
-				setSuperClass( ManagedBuildManager.getExtensionTool(superClassId) );
-			
-				// Check for migration support
-				checkForMigrationSupport();
+				setSuperClass( ManagedBuildManager.getExtensionTool(superClassId) );			
 			}
+			
+			// Check for migration support
+			checkForMigrationSupport();
+
 		}
 
 		// Get the unused children, if any