diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
index 1c7fa25f6da..61eb47bfb7f 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -30,7 +30,6 @@ feature@org.eclipse.cdt.platform=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cv
 feature@org.eclipse.cdt.gnu.build=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.gnu.build-feature
 feature@org.eclipse.cdt.gnu.debug=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.gnu.debug-feature
 feature@org.eclipse.cdt=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt-feature
-feature@org.eclipse.cdt-feature=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt-feature
 
 ! Platform specific
 fragment@org.eclipse.cdt.core.aix=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.core.aix
diff --git a/releng/org.eclipse.cdt.sdk-feature/build.properties b/releng/org.eclipse.cdt.sdk-feature/build.properties
index acb9bac9f6d..a0e06e28867 100644
--- a/releng/org.eclipse.cdt.sdk-feature/build.properties
+++ b/releng/org.eclipse.cdt.sdk-feature/build.properties
@@ -13,4 +13,6 @@ bin.includes = feature.xml,\
                feature.properties,\
                license.html,\
                epl-v10.html
-generate.feature@org.eclipse.cdt.source=org.eclipse.cdt-feature
+generate.feature@org.eclipse.cdt.source=org.eclipse.cdt.platform,\
+               feature@org.eclipse.cdt.gnu.build.source,\
+               feature@org.eclipse.cdt.gnu.debug.source
diff --git a/releng/org.eclipse.cdt.sdk-feature/sourceTemplateFeature/build.properties b/releng/org.eclipse.cdt.sdk-feature/sourceTemplateFeature/build.properties
new file mode 100644
index 00000000000..231dfcf1486
--- /dev/null
+++ b/releng/org.eclipse.cdt.sdk-feature/sourceTemplateFeature/build.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# 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
+###############################################################################
+
+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