diff --git a/releng/org.eclipse.cdt.releng/manifest.xml b/releng/org.eclipse.cdt.releng/manifest.xml
index 9d83e6a83b5..8239c31e8b4 100644
--- a/releng/org.eclipse.cdt.releng/manifest.xml
+++ b/releng/org.eclipse.cdt.releng/manifest.xml
@@ -16,6 +16,8 @@
     <plugin name="org.eclipse.cdt.launch" type="plugin"/>
     <plugin name="org.eclipse.cdt.linux.gtk" type="plugin"/>
     <plugin name="org.eclipse.cdt.linux.motif" type="plugin"/>
+    <plugin name="org.eclipse.cdt.make.core" type="plugin"/>
+    <plugin name="org.eclipse.cdt.make.ui" type="plugin"/>
     <plugin name="org.eclipse.cdt.managedbuilder.core" type="plugin"/>
     <plugin name="org.eclipse.cdt.managedbuilder.ui" type="plugin"/>
     <plugin name="org.eclipse.cdt.qnx.photon" type="plugin"/>
@@ -28,6 +30,7 @@
     <feature name="org.eclipse.cdt" suffix="-feature" type="feature" visible="false"/>
     <feature name="org.eclipse.cdt.linux.gtk" suffix="-feature" type="feature"/>
     <feature name="org.eclipse.cdt.linux.motif" suffix="-feature" type="feature"/>
+    <feature name="org.eclipse.cdt.make" suffix="-feature" type="feature"/>
     <feature name="org.eclipse.cdt.managedbuilder" suffix="-feature" type="feature"/>
     <feature name="org.eclipse.cdt.qnx.photon" suffix="-feature" type="feature"/>
     <feature name="org.eclipse.cdt.solaris.motif" suffix="-feature" type="feature"/>
diff --git a/releng/org.eclipse.cdt.releng/plugin.xsl b/releng/org.eclipse.cdt.releng/plugin.xsl
index aafda27f9bb..d4594efbeea 100644
--- a/releng/org.eclipse.cdt.releng/plugin.xsl
+++ b/releng/org.eclipse.cdt.releng/plugin.xsl
@@ -44,7 +44,7 @@
 	</xsl:copy>	
     </xsl:template>
 
-    <xsl:template mode="feature" match="import[starts-with(@plugin,'org.eclipse.cdt')]">
+    <xsl:template mode="feature" match="import[starts-with(@plugin,'org.eclipse.cdt')]|import[starts-with(@feature,'org.eclipse.cdt')]">
         <xsl:copy>
 	    <xsl:attribute name="version">
 	        <xsl:value-of select="$version"/>