diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java
index 6b182919a5e..467040423c8 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java
@@ -187,7 +187,7 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab {
 		// Workbench behaviour group
 		AccessibleListener makeTargetLabelAccessibleListener = new AccessibleAdapter() {
 			public void getName(AccessibleEvent e) {
-				e.result = Messages.getString("BuilderSettingsTab.16");
+				e.result = Messages.getString("BuilderSettingsTab.16"); //$NON-NLS-1$
 			}
 		};
 		Group g4 = setupGroup(comp, Messages.getString("BuilderSettingsTab.14"), 3, GridData.FILL_HORIZONTAL); //$NON-NLS-1$
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java
index 71265a86235..22c21c5b965 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java
@@ -332,7 +332,13 @@ public class NewCfgDialog implements INewCfgDialog {
 			cfgds[i] = ManagedBuildManager.getConfigurationForDescription(descs[i]);
 			IConfiguration cfg = cfgds[i];
 			for(; cfg != null && !cfg.isExtensionElement(); cfg = cfg.getParent());
-			if (cfg != null && !lst.contains(cfg)) lst.add(cfg);
+			if (cfg != null) {
+				IConfiguration[] cfs = cfg.getProjectType().getConfigurations(); 
+				for (int j=0; j<cfs.length; j++) {
+					if (cfs[j] != null && !lst.contains(cfs[j]))
+						lst.add(cfs[j]);
+				}
+			}
 		}
 		rcfgs = (IConfiguration[])lst.toArray(new IConfiguration[lst.size()]);
 	}