diff --git a/releng/org.eclipse.cdt.releng/build.sh b/releng/org.eclipse.cdt.releng/build.sh
index bfdbe16818b..de22382a2fc 100644
--- a/releng/org.eclipse.cdt.releng/build.sh
+++ b/releng/org.eclipse.cdt.releng/build.sh
@@ -1,15 +1,9 @@
-# JAVA_HOME must be set to the root of your JRE directory (JDK if you want to do javadoc)
-# ECLIPSE_HOME must be set to the root of you Eclipse install that you want to do the build with
-#    right now, this must be a 3.1.0 install (for PDE build scripts)
-
-die() {
-	echo $*
-	exit 1
-}
-
-#[ -n "$ECLIPSE_HOME" ] || die ECLIPSE_HOME not set
-ECLIPSE_HOME=../org.eclipse.releng.basebuilder
-
 cd `dirname $0`
 
-java -cp $ECLIPSE_HOME/startup.jar org.eclipse.core.launcher.Main -application org.eclipse.ant.core.antRunner $* 2>&1 | tee build.log
+mkdir -p tools
+cd tools
+cvs -d:pserver:anonymous@dev.eclipse.org:/home/eclipse checkout org.eclipse.releng.basebuilder
+cd ..
+
+java -cp tools/org.eclipse.releng.basebuilder/startup.jar org.eclipse.core.launcher.Main \
+	-ws gtk -application org.eclipse.ant.core.antRunner $* 2>&1 | tee build.log
diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 12abd68a10d..c177fa34214 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -1,5 +1,9 @@
 <project default="build">
 
+	<target name="hi">
+		<echo message="${eclipse.home}"/>
+	</target>
+	
 	<target name="build" depends="zips,test"/>
 	<target name="cdtbuild" depends="zips,test,upload"/>
 	
@@ -24,6 +28,7 @@
 		<property name="cdtuser" value="nobody"/>
 		<property name="cdtpasswd" value="home"/>
 		<property name="remotedir" value="${cdtuser}@download1.eclipse.org:cdt/builds/${branchVersion}"/>
+		<property name="eclipseRoot" value=":pserver:anonymous@dev.eclipse.org:/home/eclipse"/>
 		<property name="baseos" value="${osgi.os}"/>
 		<property name="basews" value="${osgi.ws}"/>
 		<property name="basearch" value="${osgi.arch}"/>
@@ -90,12 +95,8 @@
 		<antcall target="tunzip"/>
 		<antcall target="tuntar"/>
 		<unzip src="${zipsdir}/org.eclipse.cdt.testing-${branchVersion}-${buildId}.zip" dest="${buildDirectory}"/>
-		<copy todir="${buildDirectory}/eclipse/plugins/org.eclipse.test">
-			<fileset dir="../org.eclipse.test"/>
-		</copy>
-		<copy todir="${buildDirectory}/eclipse/plugins/org.eclipse.ant.optional.junit">
-			<fileset dir="../org.eclipse.ant.optional.junit"/>
-		</copy>
+		<cvs cvsroot="${eclipseRoot}" dest="${buildDirectory}/eclipse/plugins" package="org.eclipse.test"/>
+		<cvs cvsroot="${eclipseRoot}" dest="${buildDirectory}/eclipse/plugins" package="org.eclipse.ant.optional.junit"/>
 		<ant antfile="test.xml" dir="${buildDirectory}/eclipse/plugins/org.eclipse.cdt.testing_${branchVersion}">
 			<property name="eclipse-home" value="${buildDirectory}/eclipse"/>
 			<property name="os" value="${baseos}"/>