diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 1f3cb578087..9faf3fdee10 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -2,7 +2,7 @@
 
 	<target name="build" depends="zips,test,updateSite"/>
 	<target name="nightly" depends="build,upload,mail"/>
-	<target name="integration" depends="zips,test,wswbmap,mail"/>
+	<target name="integration" depends="nightly,wswbmap"/>
 	<target name="milestone" depends="nightly,milestoneSite"/>
 	
 	<target name="init">
@@ -18,7 +18,7 @@
 		<property name="buildType" value="I" />
 		<property name="buildId" value="${buildType}${timestamp}"/>
 		<property name="siteurl" value="http://update.eclipse.org/tools/cdt/updates/builds/2.0"/>
-		<property name="remotedir" value="/home/www/tools/cdt/updates/builds/2.0"/>
+		<property name="remotedir" value="download.eclipse.org:/home/www/tools/cdt/updates/builds/2.0"/>
 		<property name="zipsdir" value="${buildDirectory}/${buildType}.${buildId}"/>
 		<property name="sitedir" value="${buildDirectory}/build.site"/>
 		<property name="siteversion" value="2.0.0"/>
@@ -160,28 +160,17 @@
 	</target>
 	
 	<target name="upload" depends="init" unless="hasErrors">
-		<ftp server="update.eclipse.org" userid="${cdtuser}" password="${cdtpasswd}"
-			remotedir="${remotedir}" action="put" verbose="yes">
+		<scp todir="${cdtuser}:${cdtpasswd}@${remotedir}">
 			<fileset dir="${sitedir}"/>
-		</ftp>
+		</scp>
 	</target>
 	
 	<target name="wswbmap" depends="init" unless="hasErrors">
-		<xslt style="${buildDirectory}/eclipse/plugins/org.eclipse.test/JUNIT.XSL"
-			in="${buildDirectory}/eclipse/org.eclipse.cdt.testing.xml"
-			out="${zipsdir}/index.html"/>
 		<copy file="cdt-map.in" tofile="cdt-map.txt" overwrite="true"/>
 		<replace file="cdt-map.txt" token="@buildId@" value="${buildId}"/>
-		<ftp server="update.eclipse.org" userid="${cdtuser}" password="${cdtpasswd}"
-			remotedir="/home/www/tools/cdt/wswb" action="put" verbose="yes">
+		<scp todir="${cdtuser}:${cdtpasswd}@download.eclipse.org:/home/www/tools/cdt/wswb">
 			<fileset file="cdt-map.txt"/>
-		</ftp>
-		<ftp server="update.eclipse.org" userid="${cdtuser}" password="${cdtpasswd}"
-			remotedir="/home/www/tools/cdt/wswb/${buildId}" action="mkdir" verbose="yes"/>
-		<ftp server="update.eclipse.org" userid="${cdtuser}" password="${cdtpasswd}"
-			remotedir="/home/www/tools/cdt/wswb/${buildId}" action="put" verbose="yes">
-			<fileset dir="${zipsdir}"/>
-		</ftp>
+		</scp>
 	</target>
 
 	<target name="mail" depends="init">
diff --git a/releng/org.eclipse.cdt.releng/cdt-map.in b/releng/org.eclipse.cdt.releng/cdt-map.in
index 541a65d4276..0db4c07518c 100644
--- a/releng/org.eclipse.cdt.releng/cdt-map.in
+++ b/releng/org.eclipse.cdt.releng/cdt-map.in
@@ -1,14 +1,14 @@
-org.eclipse.cdt-@buildId@-aix.motif.ppc.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | aix,motif,ppc | | runtime | cdt
-org.eclipse.cdt-@buildId@-hpux.motif.PA_RISC.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | hpux,motif,PA_RISC | | runtime | cdt
-org.eclipse.cdt-@buildId@-linux.gtk.x86.zip =  http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | linux,gtk,x86 & linux,*,x86 | | runtime | cdt
-org.eclipse.cdt-@buildId@-linux.motif.x86.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | linux,motif,x86 & linux,*,x86 | | runtime | cdt
-org.eclipse.cdt-@buildId@-qnx.photon.x86.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | qnx,photon,x86 | | runtime | cdt
-org.eclipse.cdt-@buildId@-solaris.motif.sparc.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | solaris,motif,sparc | | runtime | cdt
-org.eclipse.cdt-@buildId@-win32.win32.x86.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | win32,win32,x86 | | runtime | cdt
-org.eclipse.cdt.sdk-@buildId@-aix.motif.ppc.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | aix,motif,ppc | | runtime | cdt
-org.eclipse.cdt.sdk-@buildId@-hpux.motif.PA_RISC.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | hpux,motif,PA_RISC | | runtime | cdt
-org.eclipse.cdt.sdk-@buildId@-linux.gtk.x86.zip =  http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | linux,gtk,x86 & linux,*,x86 | | runtime | cdt
-org.eclipse.cdt.sdk-@buildId@-linux.motif.x86.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | linux,motif,x86 & linux,*,x86 | | runtime | cdt
-org.eclipse.cdt.sdk-@buildId@-qnx.photon.x86.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | qnx,photon,x86 | | runtime | cdt
-org.eclipse.cdt.sdk-@buildId@-solaris.motif.sparc.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | solaris,motif,sparc | | runtime | cdt
-org.eclipse.cdt.sdk-@buildId@-win32.win32.x86.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | win32,win32,x86 | | runtime | cdt
+org.eclipse.cdt-@buildId@-aix.motif.ppc.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | aix,motif,ppc | | runtime | cdt
+org.eclipse.cdt-@buildId@-hpux.motif.PA_RISC.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | hpux,motif,PA_RISC | | runtime | cdt
+org.eclipse.cdt-@buildId@-linux.gtk.x86.zip =  http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | linux,gtk,x86 & linux,*,x86 | | runtime | cdt
+org.eclipse.cdt-@buildId@-linux.motif.x86.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | linux,motif,x86 & linux,*,x86 | | runtime | cdt
+org.eclipse.cdt-@buildId@-qnx.photon.x86.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | qnx,photon,x86 | | runtime | cdt
+org.eclipse.cdt-@buildId@-solaris.motif.sparc.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | solaris,motif,sparc | | runtime | cdt
+org.eclipse.cdt-@buildId@-win32.win32.x86.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | win32,win32,x86 | | runtime | cdt
+org.eclipse.cdt.sdk-@buildId@-aix.motif.ppc.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | aix,motif,ppc | | runtime | cdt
+org.eclipse.cdt.sdk-@buildId@-hpux.motif.PA_RISC.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | hpux,motif,PA_RISC | | runtime | cdt
+org.eclipse.cdt.sdk-@buildId@-linux.gtk.x86.zip =  http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | linux,gtk,x86 & linux,*,x86 | | runtime | cdt
+org.eclipse.cdt.sdk-@buildId@-linux.motif.x86.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | linux,motif,x86 & linux,*,x86 | | runtime | cdt
+org.eclipse.cdt.sdk-@buildId@-qnx.photon.x86.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | qnx,photon,x86 | | runtime | cdt
+org.eclipse.cdt.sdk-@buildId@-solaris.motif.sparc.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | solaris,motif,sparc | | runtime | cdt
+org.eclipse.cdt.sdk-@buildId@-win32.win32.x86.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | win32,win32,x86 | | runtime | cdt