diff --git a/build/org.eclipse.cdt.make.core.tests/plugin.xml b/build/org.eclipse.cdt.make.core.tests/plugin.xml
index f7e2ecbcf2f..1b9ecb17ea1 100644
--- a/build/org.eclipse.cdt.make.core.tests/plugin.xml
+++ b/build/org.eclipse.cdt.make.core.tests/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.make.core.tests"
    name="Make Core Tests Plug-in"
-   version="3.0.0"
+   version="3.1.0"
    provider-name=""
    class="org.eclipse.cdt.make.core.tests.MakeTestsPlugin">
 
diff --git a/build/org.eclipse.cdt.make.core/plugin.xml b/build/org.eclipse.cdt.make.core/plugin.xml
index f5345cf91a8..aada2b3848f 100644
--- a/build/org.eclipse.cdt.make.core/plugin.xml
+++ b/build/org.eclipse.cdt.make.core/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.make.core"
    name="%pluginName"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.make.core.MakeCorePlugin">
 
diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index 510c1cfc887..e8447fbbaa2 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.make.ui"
    name="%pluginName"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.make.internal.ui.MakeUIPlugin">
 
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
index 5ad0e38c3dd..f2a3a5d8598 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.managedbuilder.core.tests"
    name="Tests"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="Eclipse.org"
    class="org.eclipse.cdt.managedbuilder.testplugin.CTestPlugin">
    <runtime>
diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
index 89cb5064691..a77e1f30e11 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.managedbuilder.core"
    name="%pluginName"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin">
 
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
index fa6648f7c31..9581e1c4b8e 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.managedbuilder.gnu.ui"
    name="%pluginName"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.managedbuilder.gnu.ui.GnuUIPlugin">
 
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui.tests/plugin.xml
index b01caaff974..30ae22d0fc7 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui.tests/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.managedbuilder.ui.tests"
    name="Managed Build UI Tests Plug-in"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="eclipse.org"
    class="org.eclipse.cdt.managedbuilder.ui.tests.testplugin.TestsPlugin">
 
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index d61427c4572..a08692d99d4 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.managedbuilder.ui"
    name="%pluginName"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIPlugin">
 
diff --git a/core/org.eclipse.cdt.core.aix/fragment.xml b/core/org.eclipse.cdt.core.aix/fragment.xml
index e546fd258f5..bb3b489072d 100644
--- a/core/org.eclipse.cdt.core.aix/fragment.xml
+++ b/core/org.eclipse.cdt.core.aix/fragment.xml
@@ -3,10 +3,10 @@
 <fragment
    id="org.eclipse.cdt.core.aix"
    name="%fragmentName.aix"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.0.0">
+   plugin-version="3.1.0">
 
    <runtime>
       <library name="cdtaix.jar"/>
diff --git a/core/org.eclipse.cdt.core.linux.ia64/fragment.xml b/core/org.eclipse.cdt.core.linux.ia64/fragment.xml
index 218d459404e..9ec61ca98b1 100644
--- a/core/org.eclipse.cdt.core.linux.ia64/fragment.xml
+++ b/core/org.eclipse.cdt.core.linux.ia64/fragment.xml
@@ -3,9 +3,9 @@
 <fragment
    id="org.eclipse.cdt.core.linux.ia64"
    name="CDT Core ia64 Fragment"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="Eclipse.org"
    plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.0.0">
+   plugin-version="3.1.0">
 
 </fragment>
diff --git a/core/org.eclipse.cdt.core.linux.ppc/fragment.xml b/core/org.eclipse.cdt.core.linux.ppc/fragment.xml
index ef389b20dc2..1f2bb8e05c2 100644
--- a/core/org.eclipse.cdt.core.linux.ppc/fragment.xml
+++ b/core/org.eclipse.cdt.core.linux.ppc/fragment.xml
@@ -3,9 +3,9 @@
 <fragment
    id="org.eclipse.cdt.core.linux.ppc"
    name="CDT Core ppc Fragment"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="Eclipse.org"
    plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.0.0">
+   plugin-version="3.1.0">
 
 </fragment>
diff --git a/core/org.eclipse.cdt.core.linux.x86/fragment.xml b/core/org.eclipse.cdt.core.linux.x86/fragment.xml
index 5ec395a56e6..e36e571d602 100644
--- a/core/org.eclipse.cdt.core.linux.x86/fragment.xml
+++ b/core/org.eclipse.cdt.core.linux.x86/fragment.xml
@@ -3,9 +3,9 @@
 <fragment
    id="org.eclipse.cdt.core.linux.x86"
    name="X86 Fragment"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="Eclipse.org"
    plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.0.0">
+   plugin-version="3.1.0">
 
 </fragment>
diff --git a/core/org.eclipse.cdt.core.linux.x86_64/fragment.xml b/core/org.eclipse.cdt.core.linux.x86_64/fragment.xml
index cda5347caaf..5c1fe838d7b 100644
--- a/core/org.eclipse.cdt.core.linux.x86_64/fragment.xml
+++ b/core/org.eclipse.cdt.core.linux.x86_64/fragment.xml
@@ -3,9 +3,9 @@
 <fragment
    id="org.eclipse.cdt.core.linux.x86_64"
    name="CDT Core x86_64 Fragment"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="Eclipse.org"
    plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.0.0">
+   plugin-version="3.1.0">
 
 </fragment>
diff --git a/core/org.eclipse.cdt.core.linux/fragment.xml b/core/org.eclipse.cdt.core.linux/fragment.xml
index 33d4b7528a3..08c01e983bd 100644
--- a/core/org.eclipse.cdt.core.linux/fragment.xml
+++ b/core/org.eclipse.cdt.core.linux/fragment.xml
@@ -3,10 +3,10 @@
 <fragment
    id="org.eclipse.cdt.core.linux"
    name="%fragmentName.linux"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.0.0">
+   plugin-version="3.1.0">
 
    <runtime>
       <library name="cdt_linux.jar"/>
diff --git a/core/org.eclipse.cdt.core.macosx/fragment.xml b/core/org.eclipse.cdt.core.macosx/fragment.xml
index b6bea932766..7cb9a76b5c1 100644
--- a/core/org.eclipse.cdt.core.macosx/fragment.xml
+++ b/core/org.eclipse.cdt.core.macosx/fragment.xml
@@ -3,10 +3,10 @@
 <fragment
    id="org.eclipse.cdt.core.macosx"
    name="%fragmentName.macosx"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.0.0">
+   plugin-version="3.1.0">
 
    <runtime>
       <library name="cdt_macosx.jar"/>
diff --git a/core/org.eclipse.cdt.core.qnx/fragment.xml b/core/org.eclipse.cdt.core.qnx/fragment.xml
index 0aaab17cbeb..8be9b095e58 100644
--- a/core/org.eclipse.cdt.core.qnx/fragment.xml
+++ b/core/org.eclipse.cdt.core.qnx/fragment.xml
@@ -3,10 +3,10 @@
 <fragment
    id="org.eclipse.cdt.core.qnx"
    name="%fragmentName.qnx"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.0.0">
+   plugin-version="3.1.0">
 
    <runtime>
       <library name="cdt_qnx.jar"/>
diff --git a/core/org.eclipse.cdt.core.solaris/fragment.xml b/core/org.eclipse.cdt.core.solaris/fragment.xml
index 83d78b5b172..87f05634e47 100644
--- a/core/org.eclipse.cdt.core.solaris/fragment.xml
+++ b/core/org.eclipse.cdt.core.solaris/fragment.xml
@@ -3,10 +3,10 @@
 <fragment
    id="org.eclipse.cdt.core.solaris"
    name="%fragmentName.solaris"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.0.0">
+   plugin-version="3.1.0">
 
    <runtime>
       <library name="cdt_solaris.jar"/>
diff --git a/core/org.eclipse.cdt.core.tests/plugin.xml b/core/org.eclipse.cdt.core.tests/plugin.xml
index 2432ee28d28..8f67e0edce6 100644
--- a/core/org.eclipse.cdt.core.tests/plugin.xml
+++ b/core/org.eclipse.cdt.core.tests/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.core.tests"
    name="org.eclipse.cdt.core.tests"
-   version="3.0.0"
+   version="3.1.0"
    class="org.eclipse.cdt.core.testplugin.CTestPlugin">
 
    <runtime>
diff --git a/core/org.eclipse.cdt.core.win32/fragment.xml b/core/org.eclipse.cdt.core.win32/fragment.xml
index d095abb352e..b1b22264d04 100644
--- a/core/org.eclipse.cdt.core.win32/fragment.xml
+++ b/core/org.eclipse.cdt.core.win32/fragment.xml
@@ -3,10 +3,10 @@
 <fragment
    id="org.eclipse.cdt.core.win32"
    name="%fragmentName.win32"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.0.0">
+   plugin-version="3.1.0">
 
    <runtime>
       <library name="cdt_win32.jar"/>
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index d65d3ec0b57..0f1420b8960 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.core"
    name="%pluginName"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.core.CCorePlugin">
 
diff --git a/core/org.eclipse.cdt.ui.tests/plugin.xml b/core/org.eclipse.cdt.ui.tests/plugin.xml
index af580df3816..8918201efc7 100644
--- a/core/org.eclipse.cdt.ui.tests/plugin.xml
+++ b/core/org.eclipse.cdt.ui.tests/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.ui.tests"
    name="org.eclipse.cdt.ui.tests"
-   version="3.0.0"
+   version="3.1.0"
    class="org.eclipse.cdt.ui.testplugin.CTestPlugin">
 
    <runtime>
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 4e7a1a72b12..52954de3bb5 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.ui"
    name="%pluginName"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.ui.CUIPlugin">
 
diff --git a/debug/org.eclipse.cdt.debug.core/.classpath b/debug/org.eclipse.cdt.debug.core/.classpath
index d7c332af536..0cdb20b9d49 100644
--- a/debug/org.eclipse.cdt.debug.core/.classpath
+++ b/debug/org.eclipse.cdt.debug.core/.classpath
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="cdi"/>
-	<classpathentry kind="src" path="schema"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/debug/org.eclipse.cdt.debug.core/plugin.xml b/debug/org.eclipse.cdt.debug.core/plugin.xml
index 11ed8c34fe2..2c8f7eeac08 100644
--- a/debug/org.eclipse.cdt.debug.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.core/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.debug.core"
    name="%pluginName"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.debug.core.CDebugCorePlugin">
 
diff --git a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
index ed82f87b43d..cc2aeb2a479 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.debug.mi.core"
    name="%pluginName"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.debug.mi.core.MIPlugin">
 
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
index 255a2b0fce6..14c678055ed 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.debug.mi.ui"
    name="%pluginName"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin">
 
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
index 338aeec08fd..6022894072d 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.debug.ui.tests"
    name="org.eclipse.cdt.debug.ui.tests"
-   version="3.0.0"
+   version="3.1.0"
    class="org.eclipse.cdt.debug.testplugin.CTestPlugin">
 
    <runtime>
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index f097d86e4ab..552da2acf5f 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.debug.ui"
    name="%pluginName"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.debug.ui.CDebugUIPlugin">
 
diff --git a/doc/org.eclipse.cdt.doc.isv/plugin.xml b/doc/org.eclipse.cdt.doc.isv/plugin.xml
index e7d323a766a..c1898d50c07 100644
--- a/doc/org.eclipse.cdt.doc.isv/plugin.xml
+++ b/doc/org.eclipse.cdt.doc.isv/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.doc.isv"
    name="C/C++ Plugin Developer Guide"
-   version="3.0.0">
+   version="3.1.0">
    <requires>
       <import plugin="org.eclipse.help"/>
    </requires>
diff --git a/doc/org.eclipse.cdt.doc.user/build.properties b/doc/org.eclipse.cdt.doc.user/build.properties
index 9551e40ccc1..b63dcf85b5c 100644
--- a/doc/org.eclipse.cdt.doc.user/build.properties
+++ b/doc/org.eclipse.cdt.doc.user/build.properties
@@ -8,4 +8,22 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-custom=true
+bin.includes = about.html,\
+               concepts/,\
+               contexts_CDT.xml,\
+               contexts_CDT_DEBUGGER.xml,\
+               contexts_CDT_DEBUGGER_MI.xml,\
+               contexts_CDT_LAUNCH.xml,\
+               contexts_CDT_make.xml,\
+               getting_started/,\
+               help.css,\
+               images/,\
+               plugin.properties,\
+               plugin.xml,\
+               reference/,\
+               tasks/,\
+               toc.xml,\
+               topics_Concepts.xml,\
+               topics_Getting_Started.xml,\
+               topics_Reference.xml,\
+               topics_Tasks.xml
diff --git a/doc/org.eclipse.cdt.doc.user/plugin.xml b/doc/org.eclipse.cdt.doc.user/plugin.xml
index 1943de218ec..69aee99f827 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.xml
+++ b/doc/org.eclipse.cdt.doc.user/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.doc.user"
    name="%pluginName"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName">
 
    <runtime>
diff --git a/launch/org.eclipse.cdt.launch/plugin.xml b/launch/org.eclipse.cdt.launch/plugin.xml
index 5a464e74785..303c8d2f9c0 100644
--- a/launch/org.eclipse.cdt.launch/plugin.xml
+++ b/launch/org.eclipse.cdt.launch/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.launch"
    name="%pluginName"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin">
 
diff --git a/releng/org.eclipse.cdt-feature/feature.xml b/releng/org.eclipse.cdt-feature/feature.xml
index eed0f2b87a3..d04dfa18c24 100644
--- a/releng/org.eclipse.cdt-feature/feature.xml
+++ b/releng/org.eclipse.cdt-feature/feature.xml
@@ -45,62 +45,71 @@
          id="org.eclipse.cdt.core"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.cdt.ui"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.cdt"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.cdt.debug.core"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.cdt.debug.mi.core"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.cdt.debug.ui"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.cdt.launch"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.cdt.debug.mi.ui"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.cdt.doc.user"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.cdt.core.aix"
          os="aix"
          download-size="0"
          install-size="0"
-         version="3.0.0"
+         version="0.0.0"
          fragment="true"/>
 
    <plugin
@@ -108,7 +117,7 @@
          os="linux"
          download-size="0"
          install-size="0"
-         version="3.0.0"
+         version="0.0.0"
          fragment="true"/>
 
    <plugin
@@ -116,7 +125,7 @@
          os="qnx"
          download-size="0"
          install-size="0"
-         version="3.0.0"
+         version="0.0.0"
          fragment="true"/>
 
    <plugin
@@ -124,7 +133,7 @@
          os="solaris"
          download-size="0"
          install-size="0"
-         version="3.0.0"
+         version="0.0.0"
          fragment="true"/>
 
    <plugin
@@ -132,39 +141,43 @@
          os="win32"
          download-size="0"
          install-size="0"
-         version="3.0.0"
+         version="0.0.0"
          fragment="true"/>
 
    <plugin
          id="org.eclipse.cdt.make.core"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.cdt.make.ui"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.cdt.managedbuilder.core"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.cdt.managedbuilder.ui"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.cdt.core.macosx"
          os="macosx"
          download-size="0"
          install-size="0"
-         version="3.0.0"
+         version="0.0.0"
          fragment="true"/>
 
    <plugin
@@ -173,7 +186,7 @@
          arch="ia64"
          download-size="0"
          install-size="0"
-         version="3.0.0"
+         version="0.0.0"
          fragment="true"/>
 
    <plugin
@@ -182,7 +195,7 @@
          arch="ppc"
          download-size="0"
          install-size="0"
-         version="3.0.0"
+         version="0.0.0"
          fragment="true"/>
 
    <plugin
@@ -191,7 +204,7 @@
          arch="x86_64"
          download-size="0"
          install-size="0"
-         version="3.0.0"
+         version="0.0.0"
          fragment="true"/>
 
    <plugin
@@ -200,19 +213,21 @@
          arch="x86"
          download-size="0"
          install-size="0"
-         version="3.0.0"
+         version="0.0.0"
          fragment="true"/>
 
    <plugin
          id="org.eclipse.cdt.managedbuilder.gnu.ui"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.cdt.refactoring"
          download-size="0"
          install-size="0"
-         version="3.0.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 af8032a847f..0c0df46e2bc 100644
--- a/releng/org.eclipse.cdt.sdk-feature/feature.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/feature.xml
@@ -34,12 +34,14 @@
          id="org.eclipse.cdt.sdk"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.cdt.doc.isv"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/releng/org.eclipse.cdt.sdk/plugin.xml b/releng/org.eclipse.cdt.sdk/plugin.xml
index b7a2496a804..de2577f7f1a 100644
--- a/releng/org.eclipse.cdt.sdk/plugin.xml
+++ b/releng/org.eclipse.cdt.sdk/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.sdk"
    name="%pluginName"
-   version="3.0.0"
+   version="3.1.0"
    provider-name="%providerName">
 
 
diff --git a/releng/org.eclipse.cdt.testing-feature/feature.xml b/releng/org.eclipse.cdt.testing-feature/feature.xml
index 7fef9634468..2bd3e764841 100644
--- a/releng/org.eclipse.cdt.testing-feature/feature.xml
+++ b/releng/org.eclipse.cdt.testing-feature/feature.xml
@@ -38,55 +38,55 @@
          id="org.eclipse.cdt.debug.ui.tests"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.ui.tests"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.testing"
          download-size="0"
          install-size="0"
-         version="3.1.0"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.core.tests"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.ant.optional.junit"
          download-size="0"
          install-size="0"
-         version="2.1.0"
+         version="0.0.0"
          fragment="true"/>
 
    <plugin
          id="org.eclipse.test"
          download-size="0"
          install-size="0"
-         version="3.1.0"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.managedbuilder.core.tests"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.managedbuilder.ui.tests"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.refactoring.tests"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"/>
 
 </feature>
diff --git a/releng/org.eclipse.cdt/META-INF/MANIFEST.MF b/releng/org.eclipse.cdt/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..bd6c43b2e6b
--- /dev/null
+++ b/releng/org.eclipse.cdt/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui.intro,
+ org.eclipse.ui.cheatsheets
+Eclipse-AutoStart: true
diff --git a/releng/org.eclipse.cdt/build.properties b/releng/org.eclipse.cdt/build.properties
index f5b46b997ff..b973f6fc9e9 100644
--- a/releng/org.eclipse.cdt/build.properties
+++ b/releng/org.eclipse.cdt/build.properties
@@ -17,4 +17,5 @@ bin.includes = about.html,\
                plugin.properties,\
                plugin.xml,\
                css/,\
-               intro/
+               intro/,\
+               META-INF/
diff --git a/releng/org.eclipse.cdt/plugin.xml b/releng/org.eclipse.cdt/plugin.xml
index 08203d1e108..f20738b7c95 100644
--- a/releng/org.eclipse.cdt/plugin.xml
+++ b/releng/org.eclipse.cdt/plugin.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt"
-   name="%pluginName"
-   version="3.0.0"
-   provider-name="%providerName">
-  <requires>
-      <import plugin="org.eclipse.ui.intro"/>
-      <import plugin="org.eclipse.ui.cheatsheets"/>
-   </requires>
-
+<plugin>
    <extension
          point="org.eclipse.ui.intro.configExtension">
       <configExtension
@@ -39,7 +30,5 @@
       </cheatsheet>
     
    </extension-->
-   <runtime>
-   </runtime>
-
+   
 </plugin>