diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 4b9ff0e0a9b..8a1bdcb42d4 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -114,10 +114,13 @@
 	
 	<target name="wswbmap" depends="init" unless="hasErrors">
 		<copy file="cdt-map.in" tofile="cdt-map.txt" overwrite="true"/>
-		<replace file="cdt-map.txt" token="@buildId@" value="${buildId}"/>
-		<scp todir="${cdtuser}:${cdtpasswd}@download.eclipse.org:/home/www/tools/cdt/wswb">
+		<replace file="cdt-map.txt">
+			<replacefilter token="@branchVersion@" value="${branchVersion}"/>
+			<replacefilter token="@buildId@" value="${buildId}"/>
+		</replace>
+		<ftp server="${cdtserver}" remotedir="/home/www/tools/cdt/wswb" userid="${cdtuser}" password="${cdtpasswd}">
 			<fileset file="cdt-map.txt"/>
-		</scp>
+		</ftp>
 	</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 0db4c07518c..684a7480d69 100644
--- a/releng/org.eclipse.cdt.releng/cdt-map.in
+++ b/releng/org.eclipse.cdt.releng/cdt-map.in
@@ -1,14 +1,12 @@
-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
+org.eclipse.cdt-@branchVersion@-@buildId@-aix.ppc.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | aix,*,ppc | | runtime | cdt
+org.eclipse.cdt-@branchVersion@-@buildId@-hpux.PA_RISC.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | hpux,*,PA_RISC | | runtime | cdt
+org.eclipse.cdt-@branchVersion@-@buildId@-linux.x86.zip =  http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | linux,*,x86 | | runtime | cdt
+org.eclipse.cdt-@branchVersion@-@buildId@-qnx.x86.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | qnx,*,x86 | | runtime | cdt
+org.eclipse.cdt-@branchVersion@-@buildId@-solaris.sparc.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | solaris,*,sparc | | runtime | cdt
+org.eclipse.cdt-@branchVersion@-@buildId@-win32.x86.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | win32,*,x86 | | runtime | cdt
+org.eclipse.cdt.sdk-@branchVersion@-@buildId@-aix.ppc.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | aix,*,ppc | | runtime | cdt
+org.eclipse.cdt.sdk-@branchVersion@-@buildId@-hpux.PA_RISC.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | hpux,*,PA_RISC | | runtime | cdt
+org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.x86.zip =  http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | linux,*,x86 | | runtime | cdt
+org.eclipse.cdt.sdk-@branchVersion@-@buildId@-qnx.x86.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | qnx,*,x86 | | runtime | cdt
+org.eclipse.cdt.sdk-@branchVersion@-@buildId@-solaris.sparc.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | solaris,*,sparc | | runtime | cdt
+org.eclipse.cdt.sdk-@branchVersion@-@buildId@-win32.x86.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | win32,*,x86 | | runtime | cdt