diff --git a/releng/org.eclipse.cdt.releng/.cvsignore b/releng/org.eclipse.cdt.releng/.cvsignore
index 4a1771d00b1..c9726765e0b 100644
--- a/releng/org.eclipse.cdt.releng/.cvsignore
+++ b/releng/org.eclipse.cdt.releng/.cvsignore
@@ -5,3 +5,4 @@ cdt-map.txt
 build.log
 compile.log
 mail.txt
+eclipse-SDK-new.zip
diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index f43c7f7a4d9..78ef16a65f3 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -2,8 +2,8 @@
 
 	<target name="build" depends="zips,test,updateSite"/>
 	<target name="nightly" depends="build,upload,mail"/>
-	<target name="integration" depends="nightly,wswbmap"/>
-	<target name="milestone" depends="integration,milestoneSite"/>
+	<target name="integration" depends="zips,test,wswbmap,mail"/>
+	<target name="milestone" depends="nightly,milestoneSite"/>
 	
 	<target name="init">
 		<touch file="${user.home}/.cvspass" />
@@ -11,8 +11,10 @@
 		<property name="timestamp" value="${DSTAMP}${TSTAMP}" />
 		<property name="buildDirectory" value="${basedir}/results" />
 		<property name="baseLocation" value="${buildDirectory}/eclipse"/>
-		<property name="pde.build.scripts" value="${basedir}/../org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build_3.0.0/scripts" />
+		<property name="pde.build.scripts" value="${basedir}/../org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build_3.0.0/scripts"/>
 		<property name="eclipseZip" value="eclipse-SDK.zip"/>
+		<property name="collectingFolder" value="eclipse"/>
+		<property name="archivePrefix" value="eclipse"/>
 		<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"/>
@@ -22,6 +24,8 @@
 		<property name="siteversion" value="2.0.0"/>
 		<property name="milestonedir" value="${buildDirectory}/${milestone}"/>
 		<property name="buildingOSGi" value="true"/>
+		<property name="messagefile" value="message.in"/>
+		<property name="mailto" value="cdt-test-dev@eclipse.org"/>
 	</target>
 
 	<target name="zips" depends="init">
@@ -65,11 +69,40 @@
 	
 	<target name="updateSite" depends="init" unless="hasErrors">
 		<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-aix.motif.ppc.zip" dest="${sitedir}"/>
+		<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-hpux.motif.PA_RISC.zip" dest="${sitedir}"/>
 		<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-linux.gtk.x86.zip" dest="${sitedir}"/>
 		<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-linux.motif.x86.zip" dest="${sitedir}"/>
 		<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-qnx.photon.x86.zip" dest="${sitedir}"/>
 		<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-solaris.motif.sparc.zip" dest="${sitedir}"/>
 		<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-win32.win32.x86.zip" dest="${sitedir}"/>
+		<antcall target="allPlugins">
+			<param name="target" value="updateSrcPlugin"/>
+			<param name="srcPlugin" value="org.eclipse.cdt.source"/>
+		</antcall>
+		<antcall target="updateSrcPlugin">
+			<param name="id" value="org.eclipse.cdt.core.aix"/>
+			<param name="srcPlugin" value="org.eclipse.cdt.source.aix.motif.ppc"/>
+		</antcall>
+		<antcall target="updateSrcPlugin">
+			<param name="id" value="org.eclipse.cdt.core.linux"/>
+			<param name="srcPlugin" value="org.eclipse.cdt.source.linux.motif.x86"/>
+		</antcall>
+		<antcall target="updateSrcPlugin">
+			<param name="id" value="org.eclipse.cdt.core.linux"/>
+			<param name="srcPlugin" value="org.eclipse.cdt.source.linux.gtk.x86"/>
+		</antcall>
+		<antcall target="updateSrcPlugin">
+			<param name="id" value="org.eclipse.cdt.core.qnx"/>
+			<param name="srcPlugin" value="org.eclipse.cdt.source.qnx.photon.x86"/>
+		</antcall>
+		<antcall target="updateSrcPlugin">
+			<param name="id" value="org.eclipse.cdt.core.solaris"/>
+			<param name="srcPlugin" value="org.eclipse.cdt.source.solaris.motif.sparc"/>
+		</antcall>
+		<antcall target="updateSrcPlugin">
+			<param name="id" value="org.eclipse.cdt.core.win32"/>
+			<param name="srcPlugin" value="org.eclipse.cdt.source.win32.win32.x86"/>
+		</antcall>
 		<antcall target="allElements">
 			<param name="target" value="updateJars"/>
 		</antcall>
@@ -85,6 +118,12 @@
 		</copy>
 	</target>
 
+	<target name="updateSrcPlugin">
+		<move todir="${sitedir}/eclipse/plugins/${srcPlugin}_${siteversion}/src/${id}_${siteversion}.${timestamp}">
+			<fileset dir="${sitedir}/eclipse/plugins/${srcPlugin}_${siteversion}/src/${id}_${siteversion}"/>
+		</move>
+	</target>
+
 	<target name="updateJars">
 		<xslt style="plugin.xsl" in="${sitedir}/eclipse/${dir}/${id}_${siteversion}/${type}.xml" out="x">
 			<param name="version" expression="${siteversion}.${timestamp}"/>
@@ -123,44 +162,50 @@
 			<fileset dir="${sitedir}"/>
 		</ftp>
 	</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">
 			<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>
 	</target>
-	
+
 	<target name="mail" depends="init">
 		<antcall target="mailPass"/>
 		<antcall target="mailFail"/>
 	</target>
 	
 	<target name="mailPass" unless="hasErrors">
+		<copy file="${messagefile}" tofile="message.txt" overwrite="true"/>
+		<replace file="message.txt" token="@buildId@" value="${buildId}"/>
 		<concat destfile="mail.txt">
 			<filelist dir="${basedir}" files="message.txt,compile.log"/>
 		</concat>
 		<mail subject="CDT Build ${siteversion}.${timestamp} completed"
-			tolist="cdt-test-dev@eclipse.org" from="dschaefe@ca.ibm.com">
+			tolist="${mailto}" from="dschaefe@ca.ibm.com">
 			<message src="mail.txt"/>
 		</mail>
 	</target>
 
 	<target name="mailFail" if="hasErrors">
 		<mail subject="CDT Build ${siteversion}.${timestamp} failed"
-			tolist="cdt-test-dev@eclipse.org" from="dschaefe@ca.ibm.com">
+			tolist="${mailto}" from="dschaefe@ca.ibm.com">
 			<message src="compile.log"/>
 		</mail>
 	</target>
 
- 	<target name="allElements">
- 		<antcall target="${target}">
- 			<param name="type" value="feature"/>
- 			<param name="dir" value="features"/>
- 			<param name="id" value="org.eclipse.cdt"/>
- 		</antcall>
+	<target name="allPlugins">
  		<antcall target="${target}">
  			<param name="type" value="plugin"/>
  			<param name="dir" value="plugins"/>
@@ -171,31 +216,6 @@
  			<param name="dir" value="plugins"/>
  			<param name="id" value="org.eclipse.cdt.core"/>
  		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.core.aix"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.core.linux"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.core.qnx"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.core.solaris"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.core.win32"/>
- 		</antcall>
  		<antcall target="${target}">
  			<param name="type" value="plugin"/>
  			<param name="dir" value="plugins"/>
@@ -216,11 +236,6 @@
  			<param name="dir" value="plugins"/>
  			<param name="id" value="org.eclipse.cdt.debug.ui"/>
  		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.doc.user"/>
- 		</antcall>
  		<antcall target="${target}">
  			<param name="type" value="plugin"/>
  			<param name="dir" value="plugins"/>
@@ -251,6 +266,95 @@
  			<param name="dir" value="plugins"/>
  			<param name="id" value="org.eclipse.cdt.ui"/>
  		</antcall>
- 	</target>
+	</target>
+
+ 	<target name="allElements">
+		<antcall target="allPlugins"/>
+ 		<antcall target="${target}">
+ 			<param name="type" value="feature"/>
+ 			<param name="dir" value="features"/>
+ 			<param name="id" value="org.eclipse.cdt"/>
+ 		</antcall>
+ 		<antcall target="${target}">
+ 			<param name="type" value="fragment"/>
+ 			<param name="dir" value="plugins"/>
+ 			<param name="id" value="org.eclipse.cdt.core.aix"/>
+			<param name="srcPlugin" value="org.eclipse.cdt.source.aix.motif.ppc"/>
+ 		</antcall>
+ 		<antcall target="${target}">
+ 			<param name="type" value="fragment"/>
+ 			<param name="dir" value="plugins"/>
+ 			<param name="id" value="org.eclipse.cdt.core.linux"/>
+			<param name="srcPlugin" value="org.eclipse.cdt.source"/>
+ 		</antcall>
+ 		<antcall target="${target}">
+ 			<param name="type" value="fragment"/>
+ 			<param name="dir" value="plugins"/>
+ 			<param name="id" value="org.eclipse.cdt.core.qnx"/>
+			<param name="srcPlugin" value="org.eclipse.cdt.source"/>
+ 		</antcall>
+ 		<antcall target="${target}">
+ 			<param name="type" value="fragment"/>
+ 			<param name="dir" value="plugins"/>
+ 			<param name="id" value="org.eclipse.cdt.core.solaris"/>
+			<param name="srcPlugin" value="org.eclipse.cdt.source"/>
+ 		</antcall>
+ 		<antcall target="${target}">
+ 			<param name="type" value="fragment"/>
+ 			<param name="dir" value="plugins"/>
+ 			<param name="id" value="org.eclipse.cdt.core.win32"/>
+			<param name="srcPlugin" value="org.eclipse.cdt.source"/>
+ 		</antcall>
+ 		<antcall target="${target}">
+ 			<param name="type" value="plugin"/>
+ 			<param name="dir" value="plugins"/>
+ 			<param name="id" value="org.eclipse.cdt.doc.user"/>
+ 		</antcall>
+ 		<antcall target="${target}">
+ 			<param name="type" value="feature"/>
+ 			<param name="dir" value="features"/>
+ 			<param name="id" value="org.eclipse.cdt.source"/>
+ 		</antcall>
+ 		<antcall target="${target}">
+ 			<param name="type" value="plugin"/>
+ 			<param name="dir" value="plugins"/>
+ 			<param name="id" value="org.eclipse.cdt.source"/>
+ 		</antcall>
+  		<antcall target="${target}">
+ 			<param name="type" value="fragment"/>
+ 			<param name="dir" value="plugins"/>
+ 			<param name="id" value="org.eclipse.cdt.source.aix.motif.ppc"/>
+ 		</antcall>
+ 		<!--antcall target="${target}">
+ 			<param name="type" value="fragment"/>
+ 			<param name="dir" value="plugins"/>
+ 			<param name="id" value="org.eclipse.cdt.source.hpux.motif.PA_RISC"/>
+ 		</antcall-->
+ 		<antcall target="${target}">
+ 			<param name="type" value="fragment"/>
+ 			<param name="dir" value="plugins"/>
+ 			<param name="id" value="org.eclipse.cdt.source.linux.gtk.x86"/>
+ 		</antcall>
+ 		<antcall target="${target}">
+ 			<param name="type" value="fragment"/>
+ 			<param name="dir" value="plugins"/>
+ 			<param name="id" value="org.eclipse.cdt.source.linux.motif.x86"/>
+ 		</antcall>
+ 		<antcall target="${target}">
+ 			<param name="type" value="fragment"/>
+ 			<param name="dir" value="plugins"/>
+ 			<param name="id" value="org.eclipse.cdt.source.qnx.photon.x86"/>
+ 		</antcall>
+ 		<antcall target="${target}">
+ 			<param name="type" value="fragment"/>
+ 			<param name="dir" value="plugins"/>
+ 			<param name="id" value="org.eclipse.cdt.source.solaris.motif.sparc"/>
+ 		</antcall>
+ 		<antcall target="${target}">
+ 			<param name="type" value="fragment"/>
+ 			<param name="dir" value="plugins"/>
+ 			<param name="id" value="org.eclipse.cdt.source.win32.win32.x86"/>
+ 		</antcall>
+  	</target>
 
 </project>
diff --git a/releng/org.eclipse.cdt.releng/builders/build.properties b/releng/org.eclipse.cdt.releng/builders/build.properties
deleted file mode 100644
index 4d2ce20afb5..00000000000
--- a/releng/org.eclipse.cdt.releng/builders/build.properties
+++ /dev/null
@@ -1,79 +0,0 @@
-#####################
-# Parameters describing how and where to execute the build.
-# Typical users need only update the following properties:
-#    baseLocation - where things you are building against are installed
-#    bootclasspath - The base jars to compile against (typicaly rt.jar)
-#    configs - the list of {os, ws, arch} configurations to build.  
-#
-# Of course any of the settings here can be overridden by spec'ing 
-# them on the command line (e.g., -DbaseLocation=d:/eclipse
-
-############# CVS CONTROL ################
-# The CVS tag to use when fetching the map files from the repository
-mapVersionTag=HEAD
-
-# The CVS tag to use when fetching elements to build.  By default the
-# builder will use whatever is in the maps.  Use this value to override
-# for example, when doing a nightly build out of HEAD
-# fetchTag=HEAD
-
-
-############## BUILD / GENERATION CONTROL ################
-# The directory into which the build elements will be fetched and where
-# the build will take place.  buildDirectory and install should be the same
-# value.
-buildDirectory=build
-
-# Type of build.  Used in naming the build output.  Typically this value is
-# one of I, N, M, S, ...
-buildType=I
-
-# ID of the build.  Used in naming the build output.
-buildId=TestBuild
-
-# Label for the build.  Used in naming the build output
-buildLabel=${buildType}.${buildId}
-
-# Timestamp for the build.  Used in naming the build output
-timestamp=007
-
-# Base location for anything the build needs to compile against.  For example,
-# when building GEF, the baseLocation should be the location of a previously
-# installed Eclipse against which the GEF code will be compiled.
-baseLocation=
-
-#Os/Ws/Arch/nl of the eclipse specified by baseLocation
-#baseos
-#basews
-#basearch
-#basenl
-
-# The location underwhich all of the build output will be collected.  This will be
-# the root path in the resultant zip file.
-collPlace=eclipse
-
-# The directory  in which to execute zip of the ${collPlace} directory
-collBase=.
-
-# The list of {os, ws, arch} configurations to build.  This 
-# value is a '&' separated list of ',' separate triples.  For example, 
-#     configs=win32,win32,x86 & linux,motif,x86
-# By default the value is *,*,*
-configs=*,*,*
-
-#Arguments to send to the zip executable
-zipargs=
-
-############# JAVA COMPILER OPTIONS ##############
-# The location of the Java jars to compile against.  Typically the rt.jar for your JDK/JRE
-#bootclasspath=d:/ibm1.3.1/jre/lib/rt.jar
-
-javacDebugInfo=on
-javacVerbose=true
-javacFailOnError=false
-
-# The version of the source code
-#javaSource=1.3
-
-# The version of the byte code targeted
-#javacTarget=1.1
diff --git a/releng/org.eclipse.cdt.releng/builders/customTargets.xml b/releng/org.eclipse.cdt.releng/builders/customTargets.xml
deleted file mode 100644
index a93e269461b..00000000000
--- a/releng/org.eclipse.cdt.releng/builders/customTargets.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<project name="Build specific targets and properties" default="noDefault" >
-
-<property name="basews" value="gtk" />
-<property name="baseos" value="linux" />
-<property name="basearch" value="x86" />
-<property name="basenl" value="en_US" />
-
-<!-- ===================================================================== -->
-<!-- Run a given ${target} on all elements being built -->
-<!-- Add on <ant> task for each top level element being built. -->
-<!-- ===================================================================== -->
-<target name="allElements">
-	<ant antfile="${genericTargets}" target="${target}" >
-		<property name="type" value="feature" />
-		<property name="id" value="org.eclipse.cdt.make" />
-	</ant>
-	<ant antfile="${genericTargets}" target="${target}" >
-		<property name="type" value="feature" />
-		<property name="id" value="org.eclipse.cdt.managedbuilder" />
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Targets to assemble the built elements for particular configurations  -->
-<!-- These generally call the generated assemble scripts (named in -->
-<!-- ${assembleScriptName}) but may also add pre and post processing -->
-<!-- Add one target for each root element and each configuration -->
-<!-- ===================================================================== -->
-
-<target name="assemble.org.eclipse.cdt.make">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-</target>
-
-<target name="assemble.org.eclipse.cdt.managedbuilder">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Check out map files from correct repository -->
-<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
-<!-- ===================================================================== -->
-<target name="getMapFiles">
-	<copy todir="${buildDirectory}/maps">
-		<fileset dir="${builder}/../maps"/>
-	</copy>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before setup -->
-<!-- ===================================================================== -->
-<target name="preSetup">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after setup but before starting the build proper -->
-<!-- ===================================================================== -->
-<target name="postSetup">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before fetching the build elements -->
-<!-- ===================================================================== -->
-<target name="preFetch">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after fetching the build elements -->
-<!-- ===================================================================== -->
-<target name="postFetch">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before generating the build scripts. -->
-<!-- ===================================================================== -->
-<target name="preGenerate">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after generating the build scripts. -->
-<!-- ===================================================================== -->
-<target name="postGenerate">
-</target>
-
-
-<!-- ===================================================================== -->
-<!-- Steps to do before running the build.xmls for the elements being built. -->
-<!-- ===================================================================== -->
-<target name="preProcess">
-	<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@">
-		<include name="**/about.mappings" />
-	</replace>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after running the build.xmls for the elements being built. -->
-<!-- ===================================================================== -->
-<target name="postProcess">
-</target>
-
-
-<!-- ===================================================================== -->
-<!-- Steps to do before running assemble. -->
-<!-- ===================================================================== -->
-<target name="preAssemble">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after  running assemble. -->
-<!-- ===================================================================== -->
-<target name="postAssemble">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after the build is done. -->
-<!-- ===================================================================== -->
-<target name="postBuild">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do to test the build results -->
-<!-- ===================================================================== -->
-<target name="test">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do to publish the build results -->
-<!-- ===================================================================== -->
-<target name="publish">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Default target                                                        -->
-<!-- ===================================================================== -->
-<target name="noDefault">
-	<echo message="You must specify a target when invoking this file" />
-</target>
-
-</project>
diff --git a/releng/org.eclipse.cdt.releng/cdt-map.in b/releng/org.eclipse.cdt.releng/cdt-map.in
index b9b47b16fb1..6ac49ccea74 100644
--- a/releng/org.eclipse.cdt.releng/cdt-map.in
+++ b/releng/org.eclipse.cdt.releng/cdt-map.in
@@ -1,7 +1,7 @@
-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@-hpux.motif.PA_RISC.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | hpux,motif,PA_RISC | | 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-@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
diff --git a/releng/org.eclipse.cdt.releng/message.txt b/releng/org.eclipse.cdt.releng/message.in
similarity index 100%
rename from releng/org.eclipse.cdt.releng/message.txt
rename to releng/org.eclipse.cdt.releng/message.in
diff --git a/releng/org.eclipse.cdt.releng/platform/.cvsignore b/releng/org.eclipse.cdt.releng/platform/.cvsignore
new file mode 100644
index 00000000000..2b3be8ddce5
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/platform/.cvsignore
@@ -0,0 +1 @@
+patch.xml
diff --git a/releng/org.eclipse.cdt.releng/platform/customTargets.xml b/releng/org.eclipse.cdt.releng/platform/customTargets.xml
index bc32d8eda3e..f427aafc9c4 100644
--- a/releng/org.eclipse.cdt.releng/platform/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/platform/customTargets.xml
@@ -83,6 +83,14 @@
 <!-- Steps to do after fetching the build elements -->
 <!-- ===================================================================== -->
 <target name="postFetch">
+	<condition property="patchesAvailable">
+		<available file="${builder}/patch.xml"/>
+	</condition>
+	<antcall target="applyPatches"/>
+</target>
+
+<target name="applyPatches" if="patchesAvailable">
+	<ant antfile="${builder}/patch.xml"/>
 </target>
 
 <!-- ===================================================================== -->