diff --git a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.properties b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.properties
index e2f2e3d1782..0a9d0501ef4 100644
--- a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.properties
+++ b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=DSF Examples Feature 
+featureName=GDB DSF Debugger Integration
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
@@ -24,7 +24,7 @@ providerName=Eclipse.org
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Examples for using the Debugger Services Framework (DSF), including basic tutorial examples and a PDA example debugger.
+description=GDB DSF Debugger Integration
 
 # copyright
 copyright=\
diff --git a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.xml b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.xml
index 08a709e22d1..cd3c0981de5 100644
--- a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.xml
+++ b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.cdt.gnu.debug"
+      id="org.eclipse.cdt.gnu.dsf"
       label="%featureName"
       version="5.1.0.qualifier"
       provider-name="%providerName">
@@ -22,39 +22,31 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.cdt.core" version="5.0.0" match="compatible"/>
+      <import plugin="org.eclipse.cdt.debug.core" version="5.0.0" match="compatible"/>
+      <import plugin="org.eclipse.core.variables" version="3.1.100" match="compatible"/>
       <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.console" version="3.1.100" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.cdt.debug.ui" version="5.0.0" match="compatible"/>
+      <import plugin="org.eclipse.cdt.ui" version="5.0.0" match="compatible"/>
       <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.variables" version="3.1.100" match="compatible"/>
-      <import plugin="org.eclipse.cdt.core" version="5.0.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.ui" version="5.0.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.debug.core" version="5.0.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.debug.mi.core" version="5.0.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.debug.ui" version="5.0.0" match="compatible"/>
+      <import plugin="org.eclipse.cdt.dsf"/>
+      <import plugin="org.eclipse.jface"/>
+      <import plugin="org.eclipse.cdt.dsf.ui"/>
    </requires>
 
    <plugin
-         id="org.eclipse.cdt.examples.dsf"
+         id="org.eclipse.cdt.dsf.gdb"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.cdt.examples.dsf.pda"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.cdt.examples.dsf.pda.ui"
+         id="org.eclipse.cdt.dsf.gdb.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/releng/org.eclipse.cdt.sdk-feature/build.properties b/releng/org.eclipse.cdt.sdk-feature/build.properties
index 9e9d3fb5e04..929c7eafcaf 100644
--- a/releng/org.eclipse.cdt.sdk-feature/build.properties
+++ b/releng/org.eclipse.cdt.sdk-feature/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2005, 2008 IBM Corporation and others.
+# Copyright (c) 2005, 2009 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
@@ -17,3 +17,4 @@ bin.includes = feature.xml,\
 generate.feature@org.eclipse.cdt.platform.source=org.eclipse.cdt.platform
 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
+generate.plugin@org.eclipse.cdt.gnu.dsf.source=org.eclipse.cdt.gnu.dsf