diff --git a/releng/org.eclipse.cdt.releng/.cvsignore b/releng/org.eclipse.cdt.releng/.cvsignore
index 56a0b346cf3..da3ba6c23a9 100644
--- a/releng/org.eclipse.cdt.releng/.cvsignore
+++ b/releng/org.eclipse.cdt.releng/.cvsignore
@@ -1,3 +1,5 @@
 eclipse-SDK.zip
 results
 workspace
+cdt-map.txt
+build.log
diff --git a/releng/org.eclipse.cdt.releng/build.sh b/releng/org.eclipse.cdt.releng/build.sh
index d20704e0cc0..4258b337372 100644
--- a/releng/org.eclipse.cdt.releng/build.sh
+++ b/releng/org.eclipse.cdt.releng/build.sh
@@ -6,4 +6,4 @@ export PATH=$JAVA_HOME/bin:$PATH
 
 cd `dirname $0`
 
-java -cp ../../startup.jar org.eclipse.core.launcher.Main -application org.eclipse.ant.core.antRunner $*
+java -cp ../../startup.jar org.eclipse.core.launcher.Main -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 2f7068d90b0..1724f935ecf 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -1,9 +1,8 @@
 <project default="zips">
 
-	<!--taskdef name="ftp" classname="org.apache.tools.ant.taskdefs.optional.net.FTP"/-->
-	
 	<target name="build" depends="zips,test,updateSite"/>
 	<target name="nightly" depends="build,upload,mail"/>
+	<target name="integration" depends="nightly,wswbmap"/>
 	
 	<target name="init">
 		<touch file="${user.home}/.cvspass" />
@@ -99,6 +98,15 @@
 		</ftp>
 	</target>
 
+	<target name="wswbmap" depends="init">
+		<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">
+			<fileset file="cdt-map.txt"/>
+		</ftp>
+	</target>
+	
 	<target name="mail" depends="init">	
 		<mail subject="CDT Build ${siteversion}.${timestamp} completed"
 			tolist="cdt-test-dev@eclipse.org" from="dschaefe@ca.ibm.com">
diff --git a/releng/org.eclipse.cdt.releng/cdt-map.in b/releng/org.eclipse.cdt.releng/cdt-map.in
new file mode 100644
index 00000000000..6c6d628e943
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/cdt-map.in
@@ -0,0 +1,8 @@
+org.eclipse.cdt-@buildId@-aix.motif.ppc.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | aix,motif,ppc | | runtime
+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
+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
+org.eclipse.cdt-@buildId@-qnx.photon.x86.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | qnx,photon,x86 | | runtime
+org.eclipse.cdt-@buildId@-solaris.motif.sparc.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | solaris,motif,sparc | | runtime
+org.eclipse.cdt-@buildId@-win32.win32.x86.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | win32,win32,x86 | | runtime
+org.eclipse.cdt.make-@buildId@.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | | | runtime
+org.eclipse.cdt.managedbuilder-@buildId@.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | | | runtime