diff --git a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/.project b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/.project
index c094e6c2bbc..35682e1881f 100644
--- a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/.project
+++ b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.cdt.gnu.dsf-feature</name>
+	<name>org.eclipse.cdt.examples.dsf-feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
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 0a9d0501ef4..ed306473b91 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=GDB DSF Debugger Integration
+featureName=CDT Debugger Services Framework (DSF) Examples 
 
 # "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=GDB DSF Debugger Integration
+description=Examples for using the Debugger Services Framework (DSF), including basic tutorial examples and a PDA example debugger.
 
 # 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 cd3c0981de5..00c088c1f43 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.dsf"
+      id="org.eclipse.cdt.examples.dsf"
       label="%featureName"
       version="5.1.0.qualifier"
       provider-name="%providerName">
@@ -22,31 +22,37 @@
    </url>
 
    <requires>
+      <import plugin="org.eclipse.ui" 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.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.cdt.dsf"/>
-      <import plugin="org.eclipse.jface"/>
       <import plugin="org.eclipse.cdt.dsf.ui"/>
+      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.core.variables" version="3.1.100" match="compatible"/>
+      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.cdt.core" version="5.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
-         id="org.eclipse.cdt.dsf.gdb"
+         id="org.eclipse.cdt.examples.dsf"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.cdt.dsf.gdb.ui"
+         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"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/releng/org.eclipse.cdt-feature/feature.xml b/releng/org.eclipse.cdt-feature/feature.xml
index b1f8dc485b0..e060859f416 100644
--- a/releng/org.eclipse.cdt-feature/feature.xml
+++ b/releng/org.eclipse.cdt-feature/feature.xml
@@ -34,5 +34,8 @@
          id="org.eclipse.cdt.gnu.debug"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.cdt.gnu.dsf"
+         version="0.0.0"/>
 
 </feature>
diff --git a/releng/org.eclipse.cdt.master/feature.xml b/releng/org.eclipse.cdt.master/feature.xml
index cc08b1c8822..e301e77e936 100644
--- a/releng/org.eclipse.cdt.master/feature.xml
+++ b/releng/org.eclipse.cdt.master/feature.xml
@@ -77,4 +77,12 @@
          id="org.eclipse.cdt.mylyn"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.cdt.gnu.dsf"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.cdt.examples.dsf"
+         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 6fb5a23b5c9..0f4e6ab611f 100644
--- a/releng/org.eclipse.cdt.platform-feature/feature.xml
+++ b/releng/org.eclipse.cdt.platform-feature/feature.xml
@@ -228,4 +228,18 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.cdt.dsf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.cdt.dsf.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature.xml b/releng/org.eclipse.cdt.sdk-feature/feature.xml
index 73b3f96f615..9e6056354f2 100644
--- a/releng/org.eclipse.cdt.sdk-feature/feature.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/feature.xml
@@ -56,4 +56,10 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="org.eclipse.cdt.gnu.dsf.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>