diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index abb17ffe477..25e041e1b90 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -64,6 +64,10 @@
                value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
          </filter>
       </page>
+   </extension>
+       
+   <extension
+         point="org.eclipse.ui.propertyPages">
       <page
             objectClass="org.eclipse.core.resources.IFile"
             adaptable="true"
@@ -72,6 +76,10 @@
             class="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildPropertyPage"
             id="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildProperties">
       </page>
+   </extension>
+      
+   <extension
+         point="org.eclipse.ui.propertyPages">
       <page
             objectClass="org.eclipse.core.resources.IFile"
             adaptable="true"
@@ -81,7 +89,31 @@
             id="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildProperties">
       </page>
    </extension>
-       
+      
+   <extension
+         point="org.eclipse.ui.propertyPages">
+      <page
+            objectClass="org.eclipse.core.resources.IFile"
+            adaptable="true"
+            name="%MngResourceProp.name"
+            nameFilter="*.cc"
+            class="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildPropertyPage"
+            id="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildProperties">
+      </page>
+   </extension>
+      
+   <extension
+         point="org.eclipse.ui.propertyPages">
+      <page
+            objectClass="org.eclipse.core.resources.IFile"
+            adaptable="true"
+            name="%MngResourceProp.name"
+            nameFilter="*.cxx"
+            class="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildPropertyPage"
+            id="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildProperties">
+      </page>
+   </extension>
+      
 <!-- Managed Make Builder Tool Specifications -->
    <extension
          id="cdt.managed.build.info"
@@ -482,7 +514,7 @@
       <tool
             natureFilter="cnature"
             sources="o"
-			outputs=""
+            outputs=""
             name="%ToolName.linker.macosx.c"
             outputFlag="-o"
             command="gcc"
@@ -596,7 +628,7 @@
       <tool
             natureFilter="ccnature"
             sources="o"
-			outputs=""
+            outputs=""
             name="%ToolName.linker.macosx.cpp"
             outputFlag="-o"
             command="g++"