diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
index 93a06519967..03c07e5845d 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
@@ -572,9 +572,10 @@
                name="%Option.Gnu.Assembler.version"
                id="gnu.both.asm.option.version"/>
          <inputType
-            sourceContentType="org.eclipse.cdt.core.asmSource"
-            sources="s,S"
-            id="cdt.managedbuild.tool.gnu.assembler.input">
+               id="cdt.managedbuild.tool.gnu.assembler.input"
+               languageId="org.eclipse.cdt.core.assembly"
+               sourceContentType="org.eclipse.cdt.core.asmSource"
+               sources="s,S">
          </inputType>
          <outputType
 			outputs="o"
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java
index 6f34f17931d..5d5985aa41b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java
@@ -396,6 +396,10 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 				if ((langSetting.getSupportedEntryKinds() & getKind()) != 0) {
 					TreeItem t = new TreeItem(langTree, SWT.NONE);
 					String langId = langSetting.getLanguageId();
+					if (langId==null && (langSetting instanceof MultiLanguageSetting)) {
+						ICLanguageSetting item1 = (ICLanguageSetting) ((MultiLanguageSetting)langSetting).getItems()[0];
+						langId = item1.getLanguageId();
+					}
 					if (langId != null && !langId.equals(EMPTY_STR)) {
 						// Bug #178033: get language name via LangManager.
 						ILanguageDescriptor langDes = LanguageManager.getInstance().getLanguageDescriptor(langId);