diff --git a/releng/org.eclipse.cdt.releng/build.sh b/releng/org.eclipse.cdt.releng/build.sh
index db7f429d4e1..176744ce06d 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_M6 org.eclipse.releng.basebuilder
+	checkout -r R35_M7 org.eclipse.releng.basebuilder
 cd ..
 
 # Let's go!
diff --git a/releng/org.eclipse.cdt.releng/master/build.properties b/releng/org.eclipse.cdt.releng/master/build.properties
index ed6e0cad56c..f8ec506d1df 100644
--- a/releng/org.eclipse.cdt.releng/master/build.properties
+++ b/releng/org.eclipse.cdt.releng/master/build.properties
@@ -110,3 +110,6 @@ javacTarget=1.5
 
 # Create individual source bundles
 individualSourceBundles=true
+
+# Generate API description
+generateAPIDescription=true
diff --git a/releng/org.eclipse.cdt.releng/master/customAssembly.xml b/releng/org.eclipse.cdt.releng/master/customAssembly.xml
index a4ca640736d..9c53657d887 100644
--- a/releng/org.eclipse.cdt.releng/master/customAssembly.xml
+++ b/releng/org.eclipse.cdt.releng/master/customAssembly.xml
@@ -22,10 +22,6 @@
 	<!-- folder ${target.folder}/${projectName}                                 -->
 	<!-- =====================================================================  -->
 	<target name="gather.bin.parts">	
-		<apitooling.apifilesgenerator
-					projectName="${projectName}"
-					targetFolder="${target.folder}"
-				projectLocation="${projectLocation}" />
 	</target>