diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties
index 085b970aa8dc7296b25e6f0c80c4c51282f055e7..ecc8b884a707f2628e2d4d00bc2a033b1e73e1e0 100644
--- a/releng.wtpbuilder/build.properties
+++ b/releng.wtpbuilder/build.properties
@@ -41,7 +41,12 @@ eclipse.builder=org.eclipse.releng.basebuilder
 eclipse.builder.version=v20070321b
 eclipse.builder.fetch=true
 
-webtools.builder.version=v200704181956
+
+wtpBuildTools.url  = http://download.eclipse.org/webtools/wtpBuildTools/drops/R2.0/T-T200704100508-200704100508/updateSite/plugins
+wtpBuildTools.file = org.eclipse.wtp.releng.tools_1.0.0.v200704100230.jar
+wtpBuildTools.name = wtp build tools
+wtpBuildTools.description = wtp build tools
+
 
 archivesFormat=*,*,*-antZip
 
diff --git a/releng.wtpbuilder/components/wst/dependency.xml b/releng.wtpbuilder/components/wst/dependency.xml
index 91272d680a34bb82b112d74ce4036337ad749e51..fade691caee2c3202f7700f3037b656ed2b1db1b 100644
--- a/releng.wtpbuilder/components/wst/dependency.xml
+++ b/releng.wtpbuilder/components/wst/dependency.xml
@@ -24,13 +24,6 @@
 		<echo message="eclipse.builder.version: ${eclipse.builder.version}" />
 		<echo message="eclipse.builder: ${eclipse.builder}" />
 
-		<mkdir dir="${pde.builder.path}/plugins/" />
-		<antcall target="getAndInstall">
-			<param name="groupId" value="wtpBuildTools" />
-			<param name="base.install.dir" value="${pde.builder.path}/plugins/" />
-		</antcall>
-
-
 
 		<antcall target="getAndInstall">
 			<param name="groupId" value="emf" />
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index 4682e681be98490cb856791d7b1c6ff69ae4b3e5..dadadb6234ea95ef06fa4a925f3f6db4c15bf48c 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -111,6 +111,7 @@
         <!-- ***  change the repo info -->
         <property name="builderCvsRoot"
                   value=":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse" />
+    	  <property name="basebuilder.path" value="${env.BUILD_HOME}/builders/${eclipse.builder.version}" />
         <!-- note: untagged or some default version of base builder is not good to use. 
             in some cases, won't run at all, in the best of cases, will simply
             be unstable, so we'll fail if we forgot to specify it -->
@@ -118,16 +119,17 @@
         <mkdir dir="${env.BUILD_HOME}/builders/${eclipse.builder.version}" />
         <cvs cvsRoot="${builderCvsRoot}"
              package="org.eclipse.releng.basebuilder"
-             dest="${env.BUILD_HOME}/builders/${eclipse.builder.version}"
+             dest="${basebuilder.path}"
              tag="${eclipse.builder.version}" />
 
 				<!-- now add our WTP base builder -->
-        <property name="wtpBuilderCvsRoot"
-                  value=":pserver:anonymous@dev.eclipse.org:/cvsroot/webtools" />
-				<cvs cvsRoot="${wtpBuilderCvsRoot}"
-             package="org.eclipse.wtp.releng.tools"
-             dest="${env.BUILD_HOME}/builders/${eclipse.builder.version}"
-             tag="${webtools.builder.version}" />
+  		  <get dest="${basebuilder.path}/plugins" src="${wtpBuilderTools.url}/${wtpBuilder.file}"/>
+    	
+  		<antcall target="getAndInstall">
+  			<param name="groupId" value="wtpBuildTools" />
+  			<param name="base.install.dir" value="${pde.builder.path}/plugins/" />
+  		</antcall>
+
 
 
     </target>