diff --git a/releng/org.eclipse.cdt.master/build.properties b/releng/org.eclipse.cdt.master/build.properties
index 0b415791b0a..3a7439ce545 100644
--- a/releng/org.eclipse.cdt.master/build.properties
+++ b/releng/org.eclipse.cdt.master/build.properties
@@ -2,3 +2,5 @@ bin.includes = eclipse_update_120.jpg,\
                epl-v10.html,\
                feature.xml,\
                license.html
+
+individualSourceBundles=true
diff --git a/releng/org.eclipse.cdt.sdk-feature/build.properties b/releng/org.eclipse.cdt.sdk-feature/build.properties
index 929c7eafcaf..ada2ccb5833 100644
--- a/releng/org.eclipse.cdt.sdk-feature/build.properties
+++ b/releng/org.eclipse.cdt.sdk-feature/build.properties
@@ -14,7 +14,10 @@ bin.includes = feature.xml,\
                license.html,\
                epl-v10.html
                
-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
+generate.feature@org.eclipse.cdt.platform.source=org.eclipse.cdt.platform,\
+  exclude@org.eclipse.platform.doc.user
+
+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.feature@org.eclipse.cdt.gnu.dsf.source=org.eclipse.cdt.gnu.dsf
+   
\ No newline at end of file
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature.xml b/releng/org.eclipse.cdt.sdk-feature/feature.xml
index 7e8203ed577..a2838c08133 100644
--- a/releng/org.eclipse.cdt.sdk-feature/feature.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/feature.xml
@@ -24,6 +24,15 @@
    <includes
          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"/>
+   <includes
+         id="org.eclipse.cdt.gnu.dsf.source"
+         version="0.0.0"/>
 
    <requires>
       <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
@@ -44,22 +53,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.cdt.gnu.build.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.cdt.gnu.debug.source"
-         download-size="0"
-         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>