diff --git a/releng/org.eclipse.cdt-feature/feature.xml b/releng/org.eclipse.cdt-feature/feature.xml
index fb6b8eee08c..07fa55cff1d 100644
--- a/releng/org.eclipse.cdt-feature/feature.xml
+++ b/releng/org.eclipse.cdt-feature/feature.xml
@@ -30,6 +30,10 @@
          id="org.eclipse.cdt.gnu.build"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.cdt.gdb"
+         version="0.0.0"/>
+
    <includes
          id="org.eclipse.cdt.gnu.debug"
          version="0.0.0"/>
@@ -38,7 +42,4 @@
          id="org.eclipse.cdt.gnu.dsf"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.cdt.gdb"
-         version="0.0.0"/>
 </feature>
diff --git a/releng/org.eclipse.cdt.platform-feature/feature.xml b/releng/org.eclipse.cdt.platform-feature/feature.xml
index 02921a479d2..58b0f9948e7 100644
--- a/releng/org.eclipse.cdt.platform-feature/feature.xml
+++ b/releng/org.eclipse.cdt.platform-feature/feature.xml
@@ -49,6 +49,7 @@
       <import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.core.expressions"/>
       <import plugin="org.eclipse.jface.text" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.cdt.make.core" version="7.0.0" match="compatible"/>
       <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.compare" version="3.3.0" match="compatible"/>
       <import plugin="org.eclipse.cdt.managedbuilder.core" version="7.0.0" match="compatible"/>
@@ -76,7 +77,7 @@
       <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.cdt.ui" version="5.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.expressions" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.make.core" version="7.0.0" match="compatible"/>
+      <import plugin="org.eclipse.cdt.core" version="5.2.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
index 58758fc31b0..e2975847b22 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -25,16 +25,20 @@ plugin@org.eclipse.cdt.doc.isv=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/all/org.
 
 plugin@org.eclipse.cdt=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt
 
-plugin@org.eclipse.cdt.gdb=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.gdb
-plugin@org.eclipse.cdt.gdb.ui=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.gdb.ui
 
 ! CDT Features
 feature@org.eclipse.cdt.platform=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.platform-feature
 feature@org.eclipse.cdt.gnu.build=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.gnu.build-feature
 feature@org.eclipse.cdt.gnu.debug=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.gnu.debug-feature
-feature@org.eclipse.cdt.gdb=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.gdb-feature
 feature@org.eclipse.cdt=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt-feature
 
+
+! GDB feature
+feature@org.eclipse.cdt.gdb=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.gdb-feature
+plugin@org.eclipse.cdt.gdb=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.gdb
+plugin@org.eclipse.cdt.gdb.ui=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.gdb.ui
+
+
 ! Platform specific
 fragment@org.eclipse.cdt.core.aix=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.core.aix
 fragment@org.eclipse.cdt.core.linux=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.core.linux