diff --git a/build/org.eclipse.cdt.make.core/plugin.properties b/build/org.eclipse.cdt.make.core/plugin.properties
index 6471d3f5ed7..df1e21f1c89 100644
--- a/build/org.eclipse.cdt.make.core/plugin.properties
+++ b/build/org.eclipse.cdt.make.core/plugin.properties
@@ -27,3 +27,5 @@ epGCCSpecsParser.name=GNU C/C++ Compiler Specs Parser
 
 extensionGCCPerProjectProfile.name=GNU C/C++ Scanner Info per project profile
 extensionGCCPerFileProfile.name=GNU C/C++ Scanner Info per file profile
+
+makefile=Makefile
\ No newline at end of file
diff --git a/build/org.eclipse.cdt.make.core/plugin.xml b/build/org.eclipse.cdt.make.core/plugin.xml
index ef9b975912a..f5345cf91a8 100644
--- a/build/org.eclipse.cdt.make.core/plugin.xml
+++ b/build/org.eclipse.cdt.make.core/plugin.xml
@@ -165,4 +165,17 @@
       </scannerInfoProvider>
    </extension>
 
+  <extension point="org.eclipse.core.runtime.contentTypes">
+	  <!-- declares a content type for Makefile files -->
+	  <content-type id="makefile" name="%makefile" 
+		  base-type="org.eclipse.core.runtime.text"
+		  priority="high"/>
+  </extension>
+   <extension point="org.eclipse.core.runtime.contentTypes"> 
+      <file-association 
+       content-type="org.eclipse.cdt.make.core.makefile"
+       file-names="Makefile,makefile,GNUMakefile"
+       file-extensions="mk"/>
+   </extension> 
+
 </plugin>
diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index ea69a2054b3..1badcff7470 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -380,7 +380,7 @@
          name="%MakefileDocumentFactory.name"
          point="org.eclipse.core.filebuffers.documentCreation">
       <factory
-            extensions="*"
+            contentTypeId="org.eclipse.cdt.make.core.makefile"
             class="org.eclipse.cdt.make.internal.ui.editor.MakefileDocumentFactory">
       </factory>
    </extension>
@@ -389,7 +389,7 @@
          name="%MakefileDocumentSetupParticipant.name"
          point="org.eclipse.core.filebuffers.documentSetup">
       <participant
-            extensions="*"
+            contentTypeId="org.eclipse.cdt.make.core.makefile"
             class="org.eclipse.cdt.make.internal.ui.editor.MakefileDocumentSetupParticipant">
       </participant>
    </extension>