diff --git a/xlc/org.eclipse.cdt.make.xlc.core/META-INF/MANIFEST.MF b/xlc/org.eclipse.cdt.make.xlc.core/META-INF/MANIFEST.MF
index c9a4f5a52a5..7e832c3754f 100644
--- a/xlc/org.eclipse.cdt.make.xlc.core/META-INF/MANIFEST.MF
+++ b/xlc/org.eclipse.cdt.make.xlc.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.make.xlc.core;singleton:=true
-Bundle-Version: 4.0.3.qualifier
+Bundle-Version: 5.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.cdt.make.core,
diff --git a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/xl/XlCSpecsConsoleParser.java b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java
similarity index 98%
rename from xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/xl/XlCSpecsConsoleParser.java
rename to xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java
index 976dc09d4ef..c1eaa1eb7ab 100644
--- a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/xl/XlCSpecsConsoleParser.java
+++ b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.make.xlc.core.scannerconfig.xl;
+package org.eclipse.cdt.make.xlc.core.scannerconfig;
 
 import java.util.List;
 import java.util.ArrayList;
diff --git a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsRunSIProvider.java b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsRunSIProvider.java
index 18e685e195e..343f5f56a24 100644
--- a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsRunSIProvider.java
+++ b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsRunSIProvider.java
@@ -36,7 +36,7 @@ public class XlCSpecsRunSIProvider extends GCCSpecsRunSIProvider {
 
 		if (rc) {
 			try {
-				this.fCompileCommand = new Path(BuildMacroProvider.getDefault()
+				this.fCompileCommand = new Path(ManagedBuildManager.getBuildMacroProvider()
 						.resolveValue(
 								this.fCompileCommand.toString(),
 								EMPTY_STRING,
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/META-INF/MANIFEST.MF b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/META-INF/MANIFEST.MF
index 0496514a26f..84d7333b445 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/META-INF/MANIFEST.MF
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.xlc.core;singleton:=true
-Bundle-Version: 4.0.3.qualifier
+Bundle-Version: 5.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.cdt.managedbuilder.core,
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.properties b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.properties
index d109ae0d3b5..fe51574e0bf 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.properties
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.properties
@@ -15,4 +15,5 @@ providerName=Eclipse.org
 
 objectFileName=Object File
 
-profileName=XL C/C++ managed make per project SCD profile
\ No newline at end of file
+profileName=XL C managed make per project scanner discovery profile
+profileNameCPP=XL C++ managed make per project scanner discovery profile
\ No newline at end of file
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.xml b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.xml
index 7bd7f2b71a7..625c844edc1 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.xml
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.xml
@@ -29,7 +29,7 @@
 			<!-- The output for C or C++ projects will be different as the ScannerInfoProvider substitute the ${specs_file} variable below with a dummy "c" file or "cpp" file -->
 			<run
 					arguments="-E -v ${plugin_state_location}/${specs_file}"
-					command="xlc"
+					command="${XL_compilerRoot}/xlc"
 					class="org.eclipse.cdt.make.xlc.core.scannerconfig.XlCSpecsRunSIProvider">
 			</run>
 			<!-- Specifies the parser for the output generated by the compiler with the above command line -->
@@ -39,5 +39,41 @@
 		</scannerInfoProvider>
 
 	</extension>
+	<!-- -->
+	<!-- Xl C ScannerConfigurationDiscoveryProfile definitions -->
+	<!-- -->
 
+	<!-- We have to extend the core of CDT's make so that we can define a new ScannerConfigurationDiscoveryProfile -->
+	<!-- A ScannerConfigurationDiscoveryProfile is used to discover information about the standard options used by the compiler, e.g. the standard include directories -->
+
+	<!-- Xl C Managed Make Per Project Profile -->
+	<!-- The Profile gathers together information about the standard include directories and standard definitions used by the compiler -->
+	<extension
+			id="XLCManagedMakePerProjectProfileCPP"
+			name="%profileNameCPP"
+			point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
+
+		<!-- The ScannerInfoCollector manages the information generated by the Profile so that it can be easily accessed afterwards -->
+		<scannerInfoCollector
+				class="org.eclipse.cdt.make.xlc.core.scannerconfig.DefaultXlCScannerInfoCollector"
+				scope="project">
+		</scannerInfoCollector>
+
+		<!-- The ScannerInfoProvider search for the information needed by the profile and send it to the ScannerInfoCollector -->
+		<scannerInfoProvider providerId="specsFile">
+			<!-- Specifies the compiler command that returns the information about standard include directories and standard definitions -->
+			<!-- The compiler command used will be always a C compiler command -->
+			<!-- The output for C or C++ projects will be different as the ScannerInfoProvider substitute the ${specs_file} variable below with a dummy "c" file or "cpp" file -->
+			<run
+					arguments="-E -v ${plugin_state_location}/${specs_file}"
+					command="${XL_compilerRoot}/xlC"
+					class="org.eclipse.cdt.make.xlc.core.scannerconfig.XlCSpecsRunSIProvider">
+			</run>
+			<!-- Specifies the parser for the output generated by the compiler with the above command line -->
+			<scannerInfoConsoleParser
+					class="org.eclipse.cdt.make.xlc.core.scannerconfig.XlCSpecsConsoleParser">
+			</scannerInfoConsoleParser>
+		</scannerInfoProvider>
+
+	</extension>
 </plugin>
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF
index a6bdcc10d0d..975856a6c97 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.xlc.ui; singleton := true
-Bundle-Version: 4.0.1.qualifier
+Bundle-Version: 5.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.managedbuilder.xlc.ui.XLCUIPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources,
  org.eclipse.cdt.managedbuilder.ui,
  org.eclipse.cdt.ui,
- org.eclipse.ui.ide
+ org.eclipse.ui.ide,
+ org.eclipse.core.variables
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.cdt.managedbuilder.xlc.ui,
  org.eclipse.cdt.managedbuilder.xlc.ui.preferences,
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties
index 09ad04e0ea1..ccd22ca5f18 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties
@@ -11,6 +11,8 @@
 pluginName = XL C/C++ Managed Build UI Plugin
 providerName = Eclipse.org
 
+variableName = XL C/C++ Compiler Root Location
+
 #Build model names
 TargetName.xlc.exe=Executable (XL C/C++)
 TargetName.xlc.so=Shared Library (XL C/C++)
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml
index c30e87e7e91..f24a2d1e4e1 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml
@@ -229,11 +229,12 @@
          outputFlag="-o"
          superClass="org.eclipse.cdt.managedbuilder.xlc.ui.tool.abstractCompiler">
            <inputType
-              sourceContentType="org.eclipse.cdt.core.cxxSource"
-			  sources="c,C,cc,cxx,cpp"
-              dependencyContentType="org.eclipse.cdt.core.cxxHeader"
-			  dependencyExtensions="h,H,hpp"
-              id="cdt.managedbuild.tool.xlc.cpp.compiler.input">
+                 dependencyContentType="org.eclipse.cdt.core.cxxHeader"
+                 dependencyExtensions="h,H,hpp"
+                 id="cdt.managedbuild.tool.xlc.cpp.compiler.input"
+                 scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP"
+                 sourceContentType="org.eclipse.cdt.core.cxxSource"
+                 sources="c,C,cc,cxx,cpp">
           </inputType>
            <option
                  category="xlc.c.compiler.category.Input"
@@ -2847,11 +2848,12 @@
 
 		  
           <inputType
-              sourceContentType="org.eclipse.cdt.core.cSource"
-		      sources="c"
-              dependencyContentType="org.eclipse.cdt.core.cHeader"
-			  dependencyExtensions="h"
-              id="cdt.managedbuild.tool.xlc.c.compiler.input">
+                dependencyContentType="org.eclipse.cdt.core.cHeader"
+                dependencyExtensions="h"
+                id="cdt.managedbuild.tool.xlc.c.compiler.input"
+                scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile"
+                sourceContentType="org.eclipse.cdt.core.cSource"
+                sources="c">
           </inputType>
           <outputType
 			  outputs="o"
@@ -3159,6 +3161,15 @@
          </projectType>
       </wizardPage>
    </extension>
+   <extension
+         point="org.eclipse.core.variables.dynamicVariables">
+      <variable
+            description="%variableDescription"
+            name="XL_compilerRoot"
+            resolver="org.eclipse.cdt.managedbuilder.xlc.ui.variables.DynamicVariableResolver"
+            supportsArgument="false">
+      </variable>
+   </extension>
 </plugin>
 
 
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/variables/DynamicVariableResolver.java b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/variables/DynamicVariableResolver.java
new file mode 100644
index 00000000000..2943c09fe97
--- /dev/null
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/variables/DynamicVariableResolver.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.managedbuilder.xlc.ui.variables;
+
+import org.eclipse.cdt.managedbuilder.xlc.ui.XLCUIPlugin;
+import org.eclipse.cdt.managedbuilder.xlc.ui.preferences.PreferenceConstants;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.variables.IDynamicVariable;
+import org.eclipse.core.variables.IDynamicVariableResolver;
+import org.eclipse.jface.preference.IPreferenceStore;
+
+/**
+ * @author crecoskie
+ *
+ */
+public class DynamicVariableResolver implements IDynamicVariableResolver {
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.variables.IDynamicVariableResolver#resolveValue(org.eclipse.core.variables.IDynamicVariable, java.lang.String)
+	 */
+	public String resolveValue(IDynamicVariable variable, String argument)
+			throws CoreException {
+
+		if (variable.getName().equals((PreferenceConstants.P_XL_COMPILER_ROOT))) {
+			IPreferenceStore prefStore = XLCUIPlugin.getDefault()
+					.getPreferenceStore();
+			return prefStore.getString(PreferenceConstants.P_XL_COMPILER_ROOT);
+		}
+
+		return null;
+	}
+
+}