diff --git a/releng/org.eclipse.cdt.platform-feature/sourceTemplateFeature/build.properties b/releng/org.eclipse.cdt.platform-feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index b0e11e37f38..00000000000
--- a/releng/org.eclipse.cdt.platform-feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation 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:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               feature.properties,\
-               license.html,\
-               epl-v10.html
-               
-#generate.feature@org.eclipse.cdt.gnu.build.source = org.eclipse.cdt.gnu.build
-#generate.feature@org.eclipse.cdt.gnu.debug.source = org.eclipse.cdt.gnu.debug
diff --git a/releng/org.eclipse.cdt.sdk-feature/build.properties b/releng/org.eclipse.cdt.sdk-feature/build.properties
index 8b09e58d4e1..cfa9e0fb4b4 100644
--- a/releng/org.eclipse.cdt.sdk-feature/build.properties
+++ b/releng/org.eclipse.cdt.sdk-feature/build.properties
@@ -15,5 +15,5 @@ bin.includes = feature.xml,\
                epl-v10.html
                
 generate.feature@org.eclipse.cdt.platform.source=org.eclipse.cdt.platform
-generate.feature@org.eclipse.cdt.gnu.build.source=org.eclipse.cdt.gnu.build
-generate.feature@org.eclipse.cdt.gnu.debug.source=org.eclipse.cdt.gnu.debug
+generate.plugin@org.eclipse.cdt.gnu.build.source=org.eclipse.cdt.gnu.build
+generate.plugin@org.eclipse.cdt.gnu.debug.source=org.eclipse.cdt.gnu.debug
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature.xml b/releng/org.eclipse.cdt.sdk-feature/feature.xml
index 54affb09380..cbf6aa55370 100644
--- a/releng/org.eclipse.cdt.sdk-feature/feature.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/feature.xml
@@ -25,14 +25,6 @@
          id="org.eclipse.cdt.platform.source"
          version="0.0.0"/>
          
-   <includes
-         id="org.eclipse.cdt.gnu.build.source"
-         version="0.0.0"/>
-   
-   <includes
-         id="org.eclipse.cdt.gnu.debug.source"
-         version="0.0.0"/>
-         
    <requires>
       <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
       <import feature="org.eclipse.cdt" version="5.0.0" match="compatible"/>
@@ -51,5 +43,13 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+   
+   <plugin
+         id="org.eclipse.cdt.gnu.build.source"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.cdt.gnu.debug.source"
+         version="0.0.0"/>
 
 </feature>