diff --git a/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml b/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
index 02f63a461a4..562e7cb4ccf 100644
--- a/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
+++ b/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
@@ -22,15 +22,14 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.cdt.debug.core" version="6.0.0" match="compatible"/>
       <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.cdt.core" version="5.0.0" match="compatible"/>
       <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.core.variables" version="3.2.200" match="greaterOrEqual"/>
+      <import plugin="com.ibm.icu"/>
       <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.cdt.debug.mi.core" version="6.0.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.debug.ui" version="6.0.0" match="compatible"/>
       <import plugin="org.eclipse.cdt.ui" version="5.0.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"/>
@@ -38,7 +37,9 @@
       <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="com.ibm.icu"/>
+      <import plugin="org.eclipse.cdt.debug.core" version="7.0.0" match="compatible"/>
+      <import plugin="org.eclipse.cdt.debug.ui" version="7.0.0" match="compatible"/>
+      <import plugin="org.eclipse.ltk.core.refactoring" version="3.5.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/releng/org.eclipse.cdt-feature/feature.xml b/releng/org.eclipse.cdt-feature/feature.xml
index 2d99a4249ce..7ab202298e7 100644
--- a/releng/org.eclipse.cdt-feature/feature.xml
+++ b/releng/org.eclipse.cdt-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt"
       label="%featureName"
-      version="6.1.0.qualifier"
+      version="7.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
diff --git a/releng/org.eclipse.cdt.master/feature.xml b/releng/org.eclipse.cdt.master/feature.xml
index eb57d6c7dea..059205366bf 100644
--- a/releng/org.eclipse.cdt.master/feature.xml
+++ b/releng/org.eclipse.cdt.master/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.master"
       label="CDT Master Feature"
-      version="6.1.0"
+      version="7.0.0"
       provider-name="Eclipse.org">
 
    <description url="http://www.example.com/description">
diff --git a/releng/org.eclipse.cdt.platform-feature/feature.xml b/releng/org.eclipse.cdt.platform-feature/feature.xml
index 72714afdea0..5a92d975428 100644
--- a/releng/org.eclipse.cdt.platform-feature/feature.xml
+++ b/releng/org.eclipse.cdt.platform-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.platform"
       label="%featureName"
-      version="6.1.0.qualifier"
+      version="7.0.0.qualifier"
       provider-name="Eclipse.org">
 
    <description>
@@ -43,7 +43,6 @@
       <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.debug.ui" version="3.3.100" match="compatible"/>
       <import plugin="org.eclipse.debug.core" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.debug.core" version="6.0.0" match="compatible"/>
       <import plugin="org.eclipse.cdt.ui" version="5.0.0" match="compatible"/>
       <import plugin="org.eclipse.ui.console" version="3.1.100" match="compatible"/>
       <import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
@@ -51,6 +50,7 @@
       <import plugin="org.eclipse.cdt.make.core" version="6.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="6.0.0" match="compatible"/>
       <import plugin="org.eclipse.ui.ide" version="3.3.0" match="compatible"/>
       <import plugin="org.eclipse.jface.text" version="3.4.0" match="compatible"/>
       <import plugin="org.eclipse.ui.workbench.texteditor" version="3.5.0" match="compatible"/>
@@ -65,11 +65,18 @@
       <import plugin="org.eclipse.ui.intro.universal"/>
       <import plugin="org.eclipse.jface.text" version="3.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.editors" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.4.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.managedbuilder.core" version="6.0.0" match="compatible"/>
+      <import plugin="org.eclipse.cdt.debug.core" version="7.0.0" match="compatible"/>
+      <import plugin="org.eclipse.jface.text" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.ui" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.debug.ui" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.dsf" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.core" version="5.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.debug.core" version="6.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.debug.ui" version="6.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/releng/org.eclipse.cdt.releng/build.sh b/releng/org.eclipse.cdt.releng/build.sh
index 2bfe69f0784..2e7d75cf8f9 100644
--- a/releng/org.eclipse.cdt.releng/build.sh
+++ b/releng/org.eclipse.cdt.releng/build.sh
@@ -29,7 +29,7 @@ umask 0022
 mkdir -p tools
 cd tools
 cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse \
-	checkout -r R35_RC4 org.eclipse.releng.basebuilder
+	checkout -r R36_M3 org.eclipse.releng.basebuilder
 cd ..
 
 # Let's go!
diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index f0c156f6238..a9ab0c067c1 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -17,7 +17,7 @@
 		<property name="eclipseDist" value="/home/data/httpd/download.eclipse.org/eclipse/downloads/drops/S-3.6M4-200912101301/eclipse-SDK-3.6M4-linux-gtk-ppc.tar.gz"/>
 		<!--property name="mylynDist" value="/home/data/httpd/download.eclipse.org/tools/mylyn/update/galileo/mylyn-3.2.0.I20090520-2300-e3.4.zip"/-->
 		<property name="rseDist" value="/home/data/httpd/download.eclipse.org/dsdp/tm/downloads/drops/R-3.1-200906171400/RSE-SDK-3.1.zip"/>
-		<property name="branchVersion" value="6.1.0"/>
+		<property name="branchVersion" value="7.0.0"/>
 		<property name="timestamp" value="${DSTAMP}${TSTAMP}" />
 		<property name="forceContextQualifier" value="${timestamp}"/>
 		<property name="buildingOSGi" value="true"/>
diff --git a/releng/org.eclipse.cdt.releng/buildsite.xml b/releng/org.eclipse.cdt.releng/buildsite.xml
index 46f7585100b..451a4e76d50 100644
--- a/releng/org.eclipse.cdt.releng/buildsite.xml
+++ b/releng/org.eclipse.cdt.releng/buildsite.xml
@@ -3,10 +3,10 @@
 	<category-def name="CDT Main Features" label="CDT Main Features"/>
 	<category-def name="CDT Optional Features" label="CDT Optional Features"/>
 	
-	<feature id="org.eclipse.cdt" url="features/org.eclipse.cdt_6.1.0.@timeStamp@.jar" version="6.1.0.@timeStamp@">
+	<feature id="org.eclipse.cdt" url="features/org.eclipse.cdt_7.0.0.@timeStamp@.jar" version="7.0.0.@timeStamp@">
 		<category name="CDT Main Features"/>
 	</feature>
-	<feature id="org.eclipse.cdt.sdk" url="features/org.eclipse.cdt.sdk_6.1.0.@timeStamp@.jar" version="6.1.0.@timeStamp@">
+	<feature id="org.eclipse.cdt.sdk" url="features/org.eclipse.cdt.sdk_7.0.0.@timeStamp@.jar" version="7.0.0.@timeStamp@">
 		<category name="CDT Main Features"/>
 	</feature>
 	<feature id="org.eclipse.cdt.debug.gdbjtag" url="features/org.eclipse.cdt.debug.gdbjtag_5.1.0.@timeStamp@.jar" version="5.1.0.@timeStamp@">
@@ -45,7 +45,7 @@
 	<feature id="org.eclipse.cdt.gnu.debug" url="features/org.eclipse.cdt.gnu.debug_6.1.0.@timeStamp@.jar" version="6.1.0.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
-	<feature id="org.eclipse.cdt.platform" url="features/org.eclipse.cdt.platform_6.1.0.@timeStamp@.jar" version="6.1.0.@timeStamp@">
+	<feature id="org.eclipse.cdt.platform" url="features/org.eclipse.cdt.platform_7.0.0.@timeStamp@.jar" version="7.0.0.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
 	<feature id="org.eclipse.cdt.gnu.dsf" url="features/org.eclipse.cdt.gnu.dsf_2.1.0.@timeStamp@.jar" version="2.1.0.@timeStamp@">
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature.xml b/releng/org.eclipse.cdt.sdk-feature/feature.xml
index 92ab567a579..07ef3bec91c 100644
--- a/releng/org.eclipse.cdt.sdk-feature/feature.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.sdk"
       label="%featureName"
-      version="6.1.0.qualifier"
+      version="7.0.0.qualifier"
       provider-name="%providerName">
 
    <description>