diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java
index b61890d21b2..7e4b65a315f 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java
@@ -16,6 +16,7 @@ import java.util.Stack;
 
 import junit.framework.TestSuite;
 
+import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.IInclude;
@@ -71,6 +72,7 @@ public class TranslationUnitTests extends TranslationUnitBaseTest {
 		suite.addTest(new TranslationUnitTests("testBug23478A"));
 		suite.addTest(new TranslationUnitTests("testBug23478B"));
 		suite.addTest(new TranslationUnitTests("testIsValidSourceUnitName"));
+		suite.addTest(new TranslationUnitTests("testAssemblyContentType_Bug186774"));
 		// TODO: suite.addTest(new
 		// TranslationUnitTests("testGetElementAtLine"));
 		return suite;
@@ -242,4 +244,9 @@ public class TranslationUnitTests extends TranslationUnitBaseTest {
 		assertTrue(CoreModel.isValidSourceUnitName(testProject.getProject(), "test.cc"));
 		assertFalse(CoreModel.isValidSourceUnitName(testProject.getProject(), "test.hh"));
 	}
+	
+	public void testAssemblyContentType_Bug186774() {
+		assertEquals(CCorePlugin.CONTENT_TYPE_ASMSOURCE, CoreModel.getRegistedContentTypeId(testProject.getProject(), "test.s"));
+		assertEquals(CCorePlugin.CONTENT_TYPE_ASMSOURCE, CoreModel.getRegistedContentTypeId(testProject.getProject(), "test.S"));
+	}
 }
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/AssemblyLanguage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/AssemblyLanguage.java
new file mode 100644
index 00000000000..f0bb68d3d15
--- /dev/null
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/AssemblyLanguage.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Wind River Systems, Inc. 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:
+ *     Anton Leherbauer (Wind River Systems) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.internal.core.model;
+
+import org.eclipse.cdt.core.dom.ICodeReaderFactory;
+import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
+import org.eclipse.cdt.core.dom.ast.IASTName;
+import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
+import org.eclipse.cdt.core.index.IIndex;
+import org.eclipse.cdt.core.model.AbstractLanguage;
+import org.eclipse.cdt.core.model.IContributedModelBuilder;
+import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.cdt.core.parser.CodeReader;
+import org.eclipse.cdt.core.parser.IParserLogService;
+import org.eclipse.cdt.core.parser.IScannerInfo;
+import org.eclipse.core.runtime.CoreException;
+
+/**
+ * Built-in language for assembly files.
+ *
+ * @since 4.0
+ */
+public class AssemblyLanguage extends AbstractLanguage {
+
+	private static final String ID= "org.eclipse.cdt.core.assembly"; //$NON-NLS-1$
+
+	/*
+	 * @see org.eclipse.cdt.core.model.ILanguage#createModelBuilder(org.eclipse.cdt.core.model.ITranslationUnit)
+	 */
+	public IContributedModelBuilder createModelBuilder(ITranslationUnit tu) {
+		return null;
+	}
+
+	/*
+	 * @see org.eclipse.cdt.core.model.ILanguage#getASTTranslationUnit(org.eclipse.cdt.core.parser.CodeReader, org.eclipse.cdt.core.parser.IScannerInfo, org.eclipse.cdt.core.dom.ICodeReaderFactory, org.eclipse.cdt.core.index.IIndex, org.eclipse.cdt.core.parser.IParserLogService)
+	 */
+	public IASTTranslationUnit getASTTranslationUnit(CodeReader reader, IScannerInfo scanInfo,
+			ICodeReaderFactory fileCreator, IIndex index, IParserLogService log) throws CoreException {
+		return null;
+	}
+
+	/*
+	 * @see org.eclipse.cdt.core.model.ILanguage#getCompletionNode(org.eclipse.cdt.core.parser.CodeReader, org.eclipse.cdt.core.parser.IScannerInfo, org.eclipse.cdt.core.dom.ICodeReaderFactory, org.eclipse.cdt.core.index.IIndex, org.eclipse.cdt.core.parser.IParserLogService, int)
+	 */
+	public IASTCompletionNode getCompletionNode(CodeReader reader, IScannerInfo scanInfo,
+			ICodeReaderFactory fileCreator, IIndex index, IParserLogService log, int offset) throws CoreException {
+		return null;
+	}
+
+	/*
+	 * @see org.eclipse.cdt.core.model.ILanguage#getId()
+	 */
+	public String getId() {
+		return ID;
+	}
+
+	/*
+	 * @see org.eclipse.cdt.core.model.ILanguage#getSelectedNames(org.eclipse.cdt.core.dom.ast.IASTTranslationUnit, int, int)
+	 */
+	public IASTName[] getSelectedNames(IASTTranslationUnit ast, int start, int length) {
+		return null;
+	}
+
+}
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index d39a2d8135f..3e392efab47 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -592,6 +592,14 @@
       <pdomLinkageFactory
             class="org.eclipse.cdt.internal.core.pdom.dom.cpp.PDOMCPPLinkageFactory"
             id="C++"/>
+      <language
+            class="org.eclipse.cdt.internal.core.model.AssemblyLanguage"
+            id="assembly"
+            name="%language.name.asm">
+         <contentType
+               id="org.eclipse.cdt.core.asmSource">
+         </contentType>
+      </language>
    </extension>
    <extension
          id="defaultConfigDataProvider"