diff --git a/releng/org.eclipse.cdt.releng/build.sh b/releng/org.eclipse.cdt.releng/build.sh
index ff583a58e7d..9bc0152f1e3 100644
--- a/releng/org.eclipse.cdt.releng/build.sh
+++ b/releng/org.eclipse.cdt.releng/build.sh
@@ -1,9 +1,16 @@
-# Treat this is an example build script
-# Please adjust paths as necessary for your build machine
+# JAVA_HOME must be set to the root of your JRE directory (JDK if you want to do javadoc)
+# ECLIPSE_HOME must be set to the root of you Eclipse install that you want to do the build with
+#    right now, this must be a 3.1.0 install (for PDE build scripts)
 
-export JAVA_HOME=/opt/java/j2sdk1.4.2_03
-export PATH=$JAVA_HOME/bin:$PATH
-export ECLIPSE_HOME=~/eclipse/3.0/eclipse
+die() {
+	echo $*
+	exit 1
+}
+
+[ -n "$JAVA_HOME" ] || die JAVA_HOME not set
+[ -n "$ECLIPSE_HOME" ] || die ECLIPSE_HOME not set
+
+export PATH="$JAVA_HOME/bin:$PATH"
 
 cd `dirname $0`
 
diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index dc16d0a6d02..6ae64725054 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -1,18 +1,16 @@
-<project default="zips">
+<project default="test-build">
 
-	<target name="build" depends="zips"/>
-	<target name="nightly" depends="build,upload,mail"/>
-	<target name="integration" depends="nightly,wswbmap"/>
-	<target name="milestone" depends="nightly,milestoneSite"/>
+	<target name="test-build" depends="zips,test"/>
+	<target name="build" depends="zips,test,upload,mail"/>
 	
 	<target name="init">
 		<touch file="${user.home}/.cvspass" />
 		<tstamp/>
-		<property name="branchVersion" value="2.1.0"/>
+		<property name="branchVersion" value="3.0.0"/>
 		<property name="timestamp" value="${DSTAMP}${TSTAMP}" />
 		<property name="buildDirectory" value="${basedir}/results" />
 		<property name="baseLocation" value="${buildDirectory}/eclipse"/>
-		<property name="pde.build.scripts" value="${eclipse.home}/plugins/org.eclipse.pde.build_3.0.0/scripts"/>
+		<property name="pde.build.scripts" value="${eclipse.home}/plugins/org.eclipse.pde.build_3.1.0/scripts"/>
 		<property name="eclipseZip" value="eclipse-SDK.zip"/>
 		<property name="collectingFolder" value="eclipse"/>
 		<property name="archivePrefix" value="eclipse"/>
@@ -23,9 +21,9 @@
 		<property name="buildingOSGi" value="true"/>
 		<property name="messagefile" value="message.in"/>
 		<property name="mailto" value="cdt-test-dev@eclipse.org"/>
-		<property name="remotedir" value="${cdtuser}:${cdtpasswd}@download1.eclipse.org:/home/www/tools/cdt/builds/${branchVersion}"/>
-		<property name="cdtserver" value="download1.eclipse.org"/>
-		<property name="cdtdir" value="/home/www/tools/cdt/builds/${branchVersion}"/>
+		<property name="cdtuser" value="nobody"/>
+		<property name="cdtpasswd" value="home"/>
+		<property name="remotedir" value="ftp://download1.eclipse.org/cdt/builds/${branchVersion}"/>
 	</target>
 
 	<target name="fetch" depends="init">
@@ -50,9 +48,15 @@
 	<target name="zips" depends="init,unzip">
 		<ant antfile="build.xml" dir="${pde.build.scripts}">
 			<property name="builder" value="${basedir}/platform" />
+			<property name="baseos" value="${osgi.os}"/>
+			<property name="basews" value="${osgi.ws}"/>
+			<property name="basearch" value="${osgi.arch}"/>
 		</ant>
 		<ant antfile="build.xml" dir="${pde.build.scripts}">
 			<property name="builder" value="${basedir}/sdk" />
+			<property name="baseos" value="${osgi.os}"/>
+			<property name="basews" value="${osgi.ws}"/>
+			<property name="basearch" value="${osgi.arch}"/>
 		</ant>
 		<concat destfile="${zipsdir}/compilelog.txt">
 			<fileset dir="${buildDirectory}/plugins" includes="**/*.bin.log"/>
@@ -71,10 +75,11 @@
 	<target name="test" depends="init" unless="hasErrors">
 		<ant antfile="build.xml" dir="${pde.build.scripts}">
 			<property name="builder" value="${basedir}/testing" />
+			<property name="baseos" value="${osgi.os}"/>
+			<property name="basews" value="${osgi.ws}"/>
+			<property name="basearch" value="${osgi.arch}"/>
 		</ant>
-		<!-- This depends on what platform we run the test, it would be
-		     nice to figure this out on the fly -->
-		<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-linux.gtk.x86.zip" dest="${buildDirectory}"/>
+		<unzip src="${zipsdir}/org.eclipse.cdt-${branchVersion}-${buildId}-${osgi.os}.${osgi.arch}.zip" dest="${buildDirectory}"/>
 		<unzip src="${zipsdir}/org.eclipse.cdt.testing-${buildId}.zip" dest="${buildDirectory}"/>
 		<copy todir="${buildDirectory}/eclipse/plugins/org.eclipse.test">
 			<fileset dir="../org.eclipse.test"/>
@@ -82,47 +87,38 @@
 		<copy todir="${buildDirectory}/eclipse/plugins/org.eclipse.ant.optional.junit">
 			<fileset dir="../org.eclipse.ant.optional.junit"/>
 		</copy>
-		<ant antfile="test.xml" dir="${buildDirectory}/eclipse/plugins/org.eclipse.cdt.testing_${siteversion}">
+		<ant antfile="test.xml" dir="${buildDirectory}/eclipse/plugins/org.eclipse.cdt.testing_${branchVersion}">
 			<property name="eclipse-home" value="${buildDirectory}/eclipse"/>
+			<property name="os" value="${osgi.os}"/>
+			<property name="ws" value="${osgi.ws}"/>
+			<property name="arch" value="${osgi.arch}"/>
 		</ant>
 		<xslt style="${buildDirectory}/eclipse/plugins/org.eclipse.test/JUNIT.XSL"
 			in="${buildDirectory}/eclipse/org.eclipse.cdt.testing.xml"
-			out="${sitedir}/logs/${siteversion}.${timestamp}.html"/>
+			out="${zipsdir}/junits.html"/>
 	</target>
 	
 	<target name="upload" depends="init" unless="hasErrors">
-		<ftp action="get" server="${cdtserver}" remotedir="${cdtdir}" userid="${cdtuser}" password="${cdtpasswd}">
-			<fileset file="index.html"/>
-		</ftp>
-		<replace file="index.html">
+		<exec dir="${buildDirectory}" executable="curl">
+			<arg line="-u${cdtuser}:${cdtpasswd} ${remotedir}/index.html -o index.html"/>
+		</exec>
+		<replace file="${buildDirectory}/index.html">
 			<replacetoken><![CDATA[  <!-- add here -->]]></replacetoken>
 			<replacevalue><![CDATA[  <li><a href="@buildId@/index.html">@buildId@</a></li>
   <!-- add here -->]]></replacevalue>
 		</replace>
-		<replace file="index.html">
+		<replace file="${buildDirectory}/index.html">
 			<replacefilter token="@buildType@" value="${buildType}"/>
 			<replacefilter token="@buildId@" value="${buildId}"/>
 		</replace>
-		<ftp server="${cdtserver}" remotedir="${cdtdir}" userid="${cdtuser}" password="${cdtpasswd}">
-			<fileset file="index.html"/>
-		</ftp>
-		<ftp action="mkdir" server="${cdtserver}" remotedir="${cdtdir}/${buildId}" userid="${cdtuser}" password="${cdtpasswd}"/>
-		<ftp server="${cdtserver}" remotedir="${cdtdir}/${buildId}" userid="${cdtuser}" password="${cdtpasswd}">
-			<fileset dir="${zipsdir}"/>
-		</ftp>
+		<exec dir="${buildDirectory}" executable="curl">
+			<arg line="-u${cdtuser}:${cdtpasswd} -T index.html ${remotedir}/index.html"/>
+		</exec>
+		<exec dir="${zipsdir}" executable="sh">
+			<arg line="${basedir}/upload.sh ${cdtuser} ${cdtpasswd} ${remotedir}/${buildId}/"/>
+		</exec>
 	</target>
 	
-	<target name="wswbmap" depends="init" unless="hasErrors">
-		<copy file="cdt-map.in" tofile="cdt-map.txt" overwrite="true"/>
-		<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"/>
-		</ftp>
-	</target>
-
 	<target name="mail" depends="init">
 		<antcall target="mailPass"/>
 		<antcall target="mailFail"/>
@@ -147,57 +143,6 @@
 		</mail>
 	</target>
 
-	<target name="milestoneSite" depends="init" unless="hasErrors">
-		<unzip src="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-aix.motif.ppc.zip" dest="${milestonedir}"/>
-		<unzip src="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-hpux.motif.PA_RISC.zip" dest="${milestonedir}"/>
-		<unzip src="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-linux.gtk.x86.zip" dest="${milestonedir}"/>
-		<unzip src="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-linux.motif.x86.zip" dest="${milestonedir}"/>
-		<unzip src="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-qnx.photon.x86.zip" dest="${milestonedir}"/>
-		<unzip src="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-solaris.motif.sparc.zip" dest="${milestonedir}"/>
-		<unzip src="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-win32.win32.x86.zip" dest="${milestonedir}"/>
-		<antcall target="allElements">
-			<param name="target" value="milestoneJars"/>
-		</antcall>
-		<copy file="site.in" tofile="${milestonedir}/site.xml"/>
-		<replace file="${milestonedir}/site.xml" token="@milestone@" value="${milestone}"/>
-		<delete dir="${milestonedir}/eclipse"/>
-		<mkdir dir="${milestonedir}/zips"/>
-		<copy file="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-aix.motif.ppc.zip"
-			tofile="${milestonedir}/zips/org.eclipse.cdt.sdk-${milestone}-aix.motif.ppc.zip"/>
-		<copy file="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-hpux.motif.PA_RISC.zip"
-			tofile="${milestonedir}/zips/org.eclipse.cdt.sdk-${milestone}-hpux.motif.PA_RISC.zip"/>
-		<copy file="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-linux.gtk.x86.zip"
-			tofile="${milestonedir}/zips/org.eclipse.cdt.sdk-${milestone}-linux.gtk.x86.zip"/>
-		<copy file="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-linux.motif.x86.zip"
-			tofile="${milestonedir}/zips/org.eclipse.cdt.sdk-${milestone}-linux.motif.x86.zip"/>
-		<copy file="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-qnx.photon.x86.zip"
-			tofile="${milestonedir}/zips/org.eclipse.cdt.sdk-${milestone}-qnx.photon.x86.zip"/>
-		<copy file="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-solaris.motif.sparc.zip"
-			tofile="${milestonedir}/zips/org.eclipse.cdt.sdk-${milestone}-solaris.motif.sparc.zip"/>
-		<copy file="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-win32.win32.x86.zip"
-			tofile="${milestonedir}/zips/org.eclipse.cdt.sdk-${milestone}-win32.win32.x86.zip"/>
-		<copy file="${zipsdir}/org.eclipse.cdt-${buildId}-aix.motif.ppc.zip"
-			tofile="${milestonedir}/zips/org.eclipse.cdt-${milestone}-aix.motif.ppc.zip"/>
-		<copy file="${zipsdir}/org.eclipse.cdt-${buildId}-hpux.motif.PA_RISC.zip"
-			tofile="${milestonedir}/zips/org.eclipse.cdt-${milestone}-hpux.motif.PA_RISC.zip"/>
-		<copy file="${zipsdir}/org.eclipse.cdt-${buildId}-linux.gtk.x86.zip"
-			tofile="${milestonedir}/zips/org.eclipse.cdt-${milestone}-linux.gtk.x86.zip"/>
-		<copy file="${zipsdir}/org.eclipse.cdt-${buildId}-linux.motif.x86.zip"
-			tofile="${milestonedir}/zips/org.eclipse.cdt-${milestone}-linux.motif.x86.zip"/>
-		<copy file="${zipsdir}/org.eclipse.cdt-${buildId}-qnx.photon.x86.zip"
-			tofile="${milestonedir}/zips/org.eclipse.cdt-${milestone}-qnx.photon.x86.zip"/>
-		<copy file="${zipsdir}/org.eclipse.cdt-${buildId}-solaris.motif.sparc.zip"
-			tofile="${milestonedir}/zips/org.eclipse.cdt-${milestone}-solaris.motif.sparc.zip"/>
-		<copy file="${zipsdir}/org.eclipse.cdt-${buildId}-win32.win32.x86.zip"
-			tofile="${milestonedir}/zips/org.eclipse.cdt-${milestone}-win32.win32.x86.zip"/>
-	</target>
-
-	<target name="milestoneJars">
-		<mkdir dir="${milestonedir}/${dir}"/>
-		<zip basedir="${milestonedir}/eclipse/${dir}/${id}_${siteversion}"
-		     zipfile="${milestonedir}/${dir}/${id}_${siteversion}.jar"/>
-	</target>
-	
 	<target name="allElements">
  		<antcall target="${target}">
  			<param name="type" value="plugin"/>
diff --git a/releng/org.eclipse.cdt.releng/buildindex.html b/releng/org.eclipse.cdt.releng/buildindex.html
index b9ddea508e1..e9ddc4d6b03 100644
--- a/releng/org.eclipse.cdt.releng/buildindex.html
+++ b/releng/org.eclipse.cdt.releng/buildindex.html
@@ -5,8 +5,8 @@
 </head>
 <body>
 <h2>CDT @branchVersion@ Build @buildId@</h2>
-<p><a href="compilelog.txt">Compile Log</a><br>
-</p>
+<p><a href="compilelog.txt">Compile Log</a></p>
+<p><a href="junits.html">JUnit Results</a></p>
 <h3>CDT Runtime Feature</h3>
 <p>includes editor, search, builders, launch, debug, gnu toolchain
 integrations for build/debug, user documentation<br>
@@ -17,33 +17,33 @@ integrations for build/debug, user documentation<br>
     <tr>
       <td style="vertical-align: top;">AIX/ppc</td>
       <td style="vertical-align: top;"><a
- href="org.eclipse.cdt-@branchVersion@-@buildId@-aix.ppc.zip">org.eclipse.cdt-@branchVersion@-@buildId@-aix.ppc.zip</a><br>
+ href="org.eclipse.cdt-@branchVersion@-@buildId@-aix.ppc.tar.gz">org.eclipse.cdt-@branchVersion@-@buildId@-aix.ppc.tar.gz</a><br>
       </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">HPUX/PA_RISC<br>
       </td>
       <td style="vertical-align: top;"><a
- href="org.eclipse.cdt-@branchVersion@-@buildId@-hpux.PA_RISC.zip">org.eclipse.cdt-@branchVersion@-@buildId@-hpux.PA_RISC.zip</a><br>
+ href="org.eclipse.cdt-@branchVersion@-@buildId@-hpux.PA_RISC.tar.gz">org.eclipse.cdt-@branchVersion@-@buildId@-hpux.PA_RISC.tar.gz</a><br>
       </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Linux/x86<br>
       </td>
       <td style="vertical-align: top;"><a
- href="org.eclipse.cdt-@branchVersion@-@buildId@-linux.x86.zip">org.eclipse.cdt-@branchVersion@-@buildId@-linux.x86.zip</a></td>
+ href="org.eclipse.cdt-@branchVersion@-@buildId@-linux.x86.tar.gz">org.eclipse.cdt-@branchVersion@-@buildId@-linux.x86.tar.gz</a></td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Linux/ppc<br>
       </td>
       <td style="vertical-align: top;"><a
- href="org.eclipse.cdt-@branchVersion@-@buildId@-linux.ppc.zip">org.eclipse.cdt-@branchVersion@-@buildId@-linux.ppc.zip</a></td>
+ href="org.eclipse.cdt-@branchVersion@-@buildId@-linux.ppc.tar.gz">org.eclipse.cdt-@branchVersion@-@buildId@-linux.ppc.tar.gz</a></td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Linux/ia64<br>
       </td>
       <td style="vertical-align: top;"><a
- href="org.eclipse.cdt-@branchVersion@-@buildId@-linux.ia64.zip">org.eclipse.cdt-@branchVersion@-@buildId@-linux.ia64.zip</a></td>
+ href="org.eclipse.cdt-@branchVersion@-@buildId@-linux.ia64.tar.gz">org.eclipse.cdt-@branchVersion@-@buildId@-linux.ia64.tar.gz</a></td>
     </tr>
     <tr>
       <td style="vertical-align: top;">MacOSX/ppc<br>
@@ -56,14 +56,14 @@ integrations for build/debug, user documentation<br>
       <td style="vertical-align: top;">QNX/x86<br>
       </td>
       <td style="vertical-align: top;"><a
- href="org.eclipse.cdt-@branchVersion@-@buildId@-qnx.x86.zip">org.eclipse.cdt-@branchVersion@-@buildId@-qnx.x86.zip</a><br>
+ href="org.eclipse.cdt-@branchVersion@-@buildId@-qnx.x86.tar.gz">org.eclipse.cdt-@branchVersion@-@buildId@-qnx.x86.tar.gz</a><br>
       </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Solaris/sparc<br>
       </td>
       <td style="vertical-align: top;"><a
- href="org.eclipse.cdt-@branchVersion@-@buildId@-solaris.sparc.zip">org.eclipse.cdt-@branchVersion@-@buildId@-solaris.sparc.zip</a><br>
+ href="org.eclipse.cdt-@branchVersion@-@buildId@-solaris.sparc.tar.gz">org.eclipse.cdt-@branchVersion@-@buildId@-solaris.sparc.tar.gz</a><br>
       </td>
     </tr>
     <tr>
@@ -84,33 +84,33 @@ integrations for build/debug, user documentation<br>
     <tr>
       <td style="vertical-align: top;">AIX/ppc</td>
       <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-aix.ppc.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-aix.ppc.zip</a><br>
+ href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-aix.ppc.tar.gz">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-aix.ppc.tar.gz</a><br>
       </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">HPUX/PA_RISC<br>
       </td>
       <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-hpux.PA_RISC.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-hpux.PA_RISC.zip</a><br>
+ href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-hpux.PA_RISC.tar.gz">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-hpux.PA_RISC.tar.gz</a><br>
       </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Linux/x86<br>
       </td>
       <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.x86.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.x86.zip</a></td>
+ href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.x86.tar.gz">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.x86.tar.gz</a></td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Linux/ppc<br>
       </td>
       <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.ppc.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.ppc.zip</a></td>
+ href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.ppc.tar.gz">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.ppc.tar.gz</a></td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Linux/ia64<br>
       </td>
       <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.ia64.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.ia64.zip</a></td>
+ href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.ia64.tar.gz">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.ia64.tar.gz</a></td>
     </tr>
     <tr>
       <td style="vertical-align: top;">MacOSX/ppc<br>
@@ -123,14 +123,14 @@ integrations for build/debug, user documentation<br>
       <td style="vertical-align: top;">QNX/x86<br>
       </td>
       <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-qnx.x86.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-qnx.x86.zip</a><br>
+ href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-qnx.x86.tar.gz">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-qnx.x86.tar.gz</a><br>
       </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Solaris/sparc<br>
       </td>
       <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-solaris.sparc.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-solaris.sparc.zip</a><br>
+ href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-solaris.sparc.tar.gz">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-solaris.sparc.tar.gz</a><br>
       </td>
     </tr>
     <tr>
diff --git a/releng/org.eclipse.cdt.releng/cdt-map.in b/releng/org.eclipse.cdt.releng/cdt-map.in
deleted file mode 100644
index 01dbfb6034a..00000000000
--- a/releng/org.eclipse.cdt.releng/cdt-map.in
+++ /dev/null
@@ -1,10 +0,0 @@
-org.eclipse.cdt-@branchVersion@-@buildId@-aix.ppc.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | aix,motif,ppc | | runtime | cdt
-org.eclipse.cdt-@branchVersion@-@buildId@-hpux.PA_RISC.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | hpux,motif,PA_RISC | | runtime | cdt
-org.eclipse.cdt-@branchVersion@-@buildId@-linux.x86.zip =  http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | linux,gtk,x86 | | runtime | cdt
-org.eclipse.cdt-@branchVersion@-@buildId@-solaris.sparc.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | solaris,motif,sparc | | runtime | cdt
-org.eclipse.cdt-@branchVersion@-@buildId@-win32.x86.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | win32,win32,x86 | | runtime | cdt
-org.eclipse.cdt.sdk-@branchVersion@-@buildId@-aix.ppc.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | aix,motif,ppc | | sdk | cdt
-org.eclipse.cdt.sdk-@branchVersion@-@buildId@-hpux.PA_RISC.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | hpux,motif,PA_RISC | | sdk | cdt
-org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.x86.zip =  http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | linux,gtk,x86 | | sdk | cdt
-org.eclipse.cdt.sdk-@branchVersion@-@buildId@-solaris.sparc.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | solaris,motif,sparc | | sdk | cdt
-org.eclipse.cdt.sdk-@branchVersion@-@buildId@-win32.x86.zip = http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@/ | win32,win32,x86 | | sdk | cdt
diff --git a/releng/org.eclipse.cdt.releng/index.xsl b/releng/org.eclipse.cdt.releng/index.xsl
deleted file mode 100644
index 8017961ed00..00000000000
--- a/releng/org.eclipse.cdt.releng/index.xsl
+++ /dev/null
@@ -1,341 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-    <xsl:output method="html" indent="yes"/>
-
-    <xsl:param name="version"/>
-    <xsl:param name="buildId"/>
-
-    <xsl:template match="/">
-        <html>
-		    <head>
-	    	    <title>CDT 2.0 Build Page</title>
-		    </head>
-		    <body>
-		        <h2>CDT 2.0 Build Page</h2>
-		        <p>
-		        	The nightly builds are currently run every weeknight
-				    To get download and install the builds, add the following
-				    as a site bookmark in Eclipse's Update Manager perspective:
-				</p>
-				<p>
-				    http://update.eclipse.org/tools/cdt/updates/builds/2.0
-				</p>
-				<p>
-				    There is one category for each build. Expanding the
-		 			category will reveal the installable features.
-		    		Currently the following features are available.
-		    		You must install the main CDT feature as well as one
-		    		or both of the builder features.
-				</p>
-				<h3>Builds</h3>
-				<p>
-				    The reports from the automated build verification test suites
-				    are linked below.
-				</p>
-				<ul>
-	    	        <xsl:apply-templates select="site/category-def"/>
-				</ul>
-		    </body>
-		</html>
-    </xsl:template>
-
-    <xsl:template match="category-def">
-        <li>
-		    <xsl:value-of select="@label"/>
-		    <ul>
-		        <li>
-				    <a>
-				        <xsl:attribute name="href">
-						    <xsl:text>logs/</xsl:text>
-						    <xsl:value-of select="substring(@label, 11, 18)"/>
-						    <xsl:text>.html</xsl:text>
-						</xsl:attribute>
-						<xsl:text>Unit Test Results</xsl:text>
-				    </a>
-					<table width="75%">
-						<tr>
-							<td>
-				    			<a>
-				    				<xsl:attribute name="href">
-					    				<xsl:text>zips/I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-					    				<xsl:text>/org.eclipse.cdt-I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-					    				<xsl:text>-aix.motif.ppc.zip</xsl:text>
-					    			</xsl:attribute>
-				    				<font size="1">
-						    			<xsl:text>org.eclipse.cdt-I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    			<xsl:text>-aix.motif.ppc.zip</xsl:text>
-						    		</font>
-				    			</a>
-				    		</td>
-							<td>
-				    			<a>
-				    				<xsl:attribute name="href">
-					    				<xsl:text>zips/I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-					    				<xsl:text>/org.eclipse.cdt-I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-					    				<xsl:text>-hpux.motif.PA_RISC.zip</xsl:text>
-					    			</xsl:attribute>
-				    				<font size="1">
-						    			<xsl:text>org.eclipse.cdt-I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    			<xsl:text>-hpux.motif.PA_RISC.zip</xsl:text>
-						    		</font>
-				    			</a>
-				    		</td>
-				    	</tr>
-				    	<tr>
-				    		<td>
-				    			<a>
-				    				<xsl:attribute name="href">
-					    				<xsl:text>zips/I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-					    				<xsl:text>/org.eclipse.cdt-I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-					    				<xsl:text>-linux.gtk.x86.zip</xsl:text>
-					    			</xsl:attribute>
-				    				<font size="1">
-						    			<xsl:text>org.eclipse.cdt-I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    			<xsl:text>-linux.gtk.x86.zip</xsl:text>
-						    		</font>
-				    			</a>
-				    		</td>
-				    		<td>
-				    			<a>
-				    				<xsl:attribute name="href">
-					    				<xsl:text>zips/I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-					    				<xsl:text>/org.eclipse.cdt-I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-					    				<xsl:text>-linux.motif.x86.zip</xsl:text>
-					    			</xsl:attribute>
-				    				<font size="1">
-						    			<xsl:text>org.eclipse.cdt-I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    			<xsl:text>-linux.motif.x86.zip</xsl:text>
-						    		</font>
-				    			</a>
-				    		</td>
-				    	</tr>
-				    	<tr>
-				    		<td>
-				    			<a>
-				    				<xsl:attribute name="href">
-					    				<xsl:text>zips/I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-					    				<xsl:text>/org.eclipse.cdt-I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-					    				<xsl:text>-qnx.photon.x86.zip</xsl:text>
-					    			</xsl:attribute>
-					    			<font size="1">
-						    			<xsl:text>org.eclipse.cdt-I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    			<xsl:text>-qnx.photon.x86.zip</xsl:text>
-						    		</font>
-				    			</a>
-				    		</td>
-				    		<td>
-				    			<a>
-				    				<xsl:attribute name="href">
-					    				<xsl:text>zips/I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-					    				<xsl:text>/org.eclipse.cdt-I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-					    				<xsl:text>-solaris.motif.sparc.zip</xsl:text>
-					    			</xsl:attribute>
-					    			<font size="1">
-						    			<xsl:text>org.eclipse.cdt-I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    			<xsl:text>-solaris.motif.sparc.zip</xsl:text>
-						    		</font>
-				    			</a>
-				    		</td>
-				    	</tr>
-				    	<tr>
-				    		<td>
-				    			<a>
-				    				<xsl:attribute name="href">
-					    				<xsl:text>zips/I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-					    				<xsl:text>/org.eclipse.cdt-I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-					    				<xsl:text>-win32.win32.x86.zip</xsl:text>
-					    			</xsl:attribute>
-					    			<font size="1">
-						    			<xsl:text>org.eclipse.cdt-I</xsl:text>
-					    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    			<xsl:text>-win32.win32.x86.zip</xsl:text>
-						    		</font>
-				    			</a>
-				    		</td>
-				    	</tr>
-				    	<xsl:if test="substring(@label, 17, 8) &lt; '20040420'">
-				    		<tr>
-					    		<td>
-					    			<a>
-					    				<xsl:attribute name="href">
-						    				<xsl:text>zips/I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>/org.eclipse.cdt.make-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>.zip</xsl:text>
-						    			</xsl:attribute>
-						    			<font size="1">
-							    			<xsl:text>org.eclipse.cdt.make-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-							    			<xsl:text>.zip</xsl:text>
-							    		</font>
-					    			</a>
-					    		</td>
-					    		<td>
-					    			<a>
-					    				<xsl:attribute name="href">
-						    				<xsl:text>zips/I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>/org.eclipse.cdt.managedbuilder-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>.zip</xsl:text>
-						    			</xsl:attribute>
-						    			<font size="1">
-							    			<xsl:text>org.eclipse.cdt.managedbuilder-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-							    			<xsl:text>.zip</xsl:text>
-							    		</font>
-					    			</a>
-					    		</td>
-					    	</tr>
-					    </xsl:if>
-				    	<xsl:if test="substring(@label, 17, 12) &gt; '200405201200'">
-							<tr>
-								<td>
-					    			<a>
-					    				<xsl:attribute name="href">
-						    				<xsl:text>zips/I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>/org.eclipse.cdt.sdk-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>-aix.motif.ppc.zip</xsl:text>
-						    			</xsl:attribute>
-					    				<font size="1">
-							    			<xsl:text>org.eclipse.cdt.sdk-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-							    			<xsl:text>-aix.motif.ppc.zip</xsl:text>
-							    		</font>
-					    			</a>
-					    		</td>
-								<td>
-					    			<a>
-					    				<xsl:attribute name="href">
-						    				<xsl:text>zips/I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>/org.eclipse.cdt.sdk-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>-hpux.motif.PA_RISC.zip</xsl:text>
-						    			</xsl:attribute>
-					    				<font size="1">
-							    			<xsl:text>org.eclipse.cdt.sdk-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-							    			<xsl:text>-hpux.motif.PA_RISC.zip</xsl:text>
-							    		</font>
-					    			</a>
-					    		</td>
-					    	</tr>
-					    	<tr>
-					    		<td>
-					    			<a>
-					    				<xsl:attribute name="href">
-						    				<xsl:text>zips/I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>/org.eclipse.cdt.sdk-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>-linux.gtk.x86.zip</xsl:text>
-						    			</xsl:attribute>
-					    				<font size="1">
-							    			<xsl:text>org.eclipse.cdt.sdk-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-							    			<xsl:text>-linux.gtk.x86.zip</xsl:text>
-							    		</font>
-					    			</a>
-					    		</td>
-					    		<td>
-					    			<a>
-					    				<xsl:attribute name="href">
-						    				<xsl:text>zips/I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>/org.eclipse.cdt.sdk-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>-linux.motif.x86.zip</xsl:text>
-						    			</xsl:attribute>
-					    				<font size="1">
-							    			<xsl:text>org.eclipse.cdt.sdk-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-							    			<xsl:text>-linux.motif.x86.zip</xsl:text>
-							    		</font>
-					    			</a>
-					    		</td>
-					    	</tr>
-					    	<tr>
-					    		<td>
-					    			<a>
-					    				<xsl:attribute name="href">
-						    				<xsl:text>zips/I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>/org.eclipse.cdt.sdk-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>-qnx.photon.x86.zip</xsl:text>
-						    			</xsl:attribute>
-						    			<font size="1">
-							    			<xsl:text>org.eclipse.cdt.sdk-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-							    			<xsl:text>-qnx.photon.x86.zip</xsl:text>
-							    		</font>
-					    			</a>
-					    		</td>
-					    		<td>
-					    			<a>
-					    				<xsl:attribute name="href">
-						    				<xsl:text>zips/I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>/org.eclipse.cdt.sdk-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>-solaris.motif.sparc.zip</xsl:text>
-						    			</xsl:attribute>
-						    			<font size="1">
-							    			<xsl:text>org.eclipse.cdt.sdk-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-							    			<xsl:text>-solaris.motif.sparc.zip</xsl:text>
-							    		</font>
-					    			</a>
-					    		</td>
-					    	</tr>
-					    	<tr>
-					    		<td>
-					    			<a>
-					    				<xsl:attribute name="href">
-						    				<xsl:text>zips/I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>/org.eclipse.cdt.sdk-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-						    				<xsl:text>-win32.win32.x86.zip</xsl:text>
-						    			</xsl:attribute>
-						    			<font size="1">
-							    			<xsl:text>org.eclipse.cdt.sdk-I</xsl:text>
-						    				<xsl:value-of select="substring(@label, 17, 12)"/>
-							    			<xsl:text>-win32.win32.x86.zip</xsl:text>
-							    		</font>
-					    			</a>
-					    		</td>
-					    	</tr>
-					    </xsl:if>
-				    </table>
-	    		</li>
-		    </ul>
-		</li>
-    </xsl:template>
-
-</xsl:transform>
diff --git a/releng/org.eclipse.cdt.releng/platform/customTargets.xml b/releng/org.eclipse.cdt.releng/platform/customTargets.xml
index 3c9a3a9164c..cf4310eb3cc 100644
--- a/releng/org.eclipse.cdt.releng/platform/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/platform/customTargets.xml
@@ -25,31 +25,31 @@
 
 <target name="assemble.org.eclipse.cdt.aix.motif.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-aix.ppc.zip"/>
+		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-aix.ppc.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.hpux.motif.PA_RISC">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-hpux.PA_RISC.zip"/>
+		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-hpux.PA_RISC.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.linux.gtk.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.x86.zip"/>
+		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.x86.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.linux.gtk.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.ppc.zip"/>
+		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.ppc.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.linux.gtk.ia64">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.ia64.zip"/>
+		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.ia64.tar.gz"/>
 	</ant>
 </target>
 
@@ -61,13 +61,13 @@
 
 <target name="assemble.org.eclipse.cdt.qnx.photon.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-qnx.x86.zip"/>
+		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-qnx.x86.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.solaris.motif.sparc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-solaris.sparc.zip"/>
+		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-solaris.sparc.tar.gz"/>
 	</ant>
 </target>
 
diff --git a/releng/org.eclipse.cdt.releng/plugin.xsl b/releng/org.eclipse.cdt.releng/plugin.xsl
deleted file mode 100644
index b1c1c3bdd40..00000000000
--- a/releng/org.eclipse.cdt.releng/plugin.xsl
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-    <xsl:output indent="yes"/>
-
-    <xsl:param name="version"/>
-
-    <xsl:template match="/plugin">
-        <plugin>
-	    <xsl:attribute name="version">
-	        <xsl:value-of select="$version"/>
-	    </xsl:attribute>
-	    <xsl:copy-of select="*|@*[not(name()='version')]"/>
-	</plugin>
-    </xsl:template>
-
-    <xsl:template match="/fragment">
-        <fragment>
-	    <xsl:attribute name="version">
-	        <xsl:value-of select="$version"/>
-	    </xsl:attribute>
-	    <xsl:attribute name="plugin-version">
-	        <xsl:value-of select="$version"/>
-	    </xsl:attribute>
-	    <xsl:copy-of select="*|@*[not(name()='version' or name()='plugin-version')]"/>
-	</fragment>
-    </xsl:template>
-
-    <xsl:template match="/feature">
-        <xsl:copy>
-	   <xsl:attribute name="version">
-	       <xsl:value-of select="$version"/>
-	   </xsl:attribute>
-	   <xsl:apply-templates mode="feature" select="@*[not(name()='version')]|*|text()"/>
-	</xsl:copy>
-    </xsl:template>
-
-    <xsl:template mode="feature" match="includes|plugin">
-        <xsl:copy>
-	    <xsl:attribute name="version">
-	        <xsl:value-of select="$version"/>
-	    </xsl:attribute>
-	    <xsl:copy-of select="*|@*[not(name()='version')]"/>
-	</xsl:copy>	
-    </xsl:template>
-
-    <xsl:template mode="feature" match="import[starts-with(@plugin,'org.eclipse.cdt')]|import[starts-with(@feature,'org.eclipse.cdt')]">
-        <xsl:copy>
-	    <xsl:attribute name="version">
-	        <xsl:value-of select="$version"/>
-	    </xsl:attribute>
-	    <xsl:copy-of select="*|@*[not(name()='version')]"/>
-	</xsl:copy>	
-    </xsl:template>
-
-    <xsl:template mode="feature" match="url/update">
-        <xsl:copy>
-	    <xsl:attribute name="url">
-	        <xsl:text>http://update.eclipse.org/tools/cdt/updates/builds/2.0</xsl:text>
-	    </xsl:attribute>
-	    <xsl:copy-of select="*|@*[not(name()='url')]"/>
-	</xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="@*|*|text()">
-        <xsl:copy>
-	    <xsl:apply-templates select="@*|*|text()"/>
-	</xsl:copy>
-    </xsl:template>
-
-    <xsl:template mode="feature" match="@*|*|text()">
-        <xsl:copy>
-	    <xsl:apply-templates mode="feature" select="@*|*|text()"/>
-	</xsl:copy>
-    </xsl:template>
-
-</xsl:transform>
diff --git a/releng/org.eclipse.cdt.releng/sdk/customTargets.xml b/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
index 5238bca2868..e9e7547d6d9 100644
--- a/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
@@ -25,31 +25,31 @@
 
 <target name="assemble.org.eclipse.cdt.sdk.aix.motif.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-aix.ppc.zip"/>
+		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-aix.ppc.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.sdk.hpux.motif.PA_RISC">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-hpux.PA_RISC.zip"/>
+		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-hpux.PA_RISC.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.sdk.linux.gtk.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.x86.zip"/>
+		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.x86.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.sdk.linux.gtk.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.ppc.zip"/>
+		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.ppc.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.sdk.linux.gtk.ia64">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.ia64.zip"/>
+		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.ia64.tar.gz"/>
 	</ant>
 </target>
 
@@ -61,13 +61,13 @@
 
 <target name="assemble.org.eclipse.cdt.sdk.qnx.photon.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-qnx.x86.zip"/>
+		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-qnx.x86.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.sdk.solaris.motif.sparc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-solaris.sparc.zip"/>
+		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-solaris.sparc.tar.gz"/>
 	</ant>
 </target>
 
diff --git a/releng/org.eclipse.cdt.releng/site.in b/releng/org.eclipse.cdt.releng/site.in
deleted file mode 100644
index b9de38310c5..00000000000
--- a/releng/org.eclipse.cdt.releng/site.in
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-	<category-def name="cdt" label="CDT @milestone@"/>
-	<feature id="org.eclipse.cdt" url="features/org.eclipse.cdt_2.0.0.jar" version="2.0.0">
-		<category name="cdt"/>
-	</feature>
-	<feature id="org.eclipse.cdt.sdk" url="features/org.eclipse.cdt.sdk_2.0.0.jar" version="2.0.0">
-		<category name="cdt"/>
-	</feature>
-</site>
diff --git a/releng/org.eclipse.cdt.releng/site.xsl b/releng/org.eclipse.cdt.releng/site.xsl
deleted file mode 100644
index 42318acfc37..00000000000
--- a/releng/org.eclipse.cdt.releng/site.xsl
+++ /dev/null
@@ -1,55 +0,0 @@
-<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-    <xsl:output indent="yes"/>
-
-    <xsl:param name="version"/>
-
-	<xsl:template match="/site">
-		<site>
-			<xsl:copy-of select="*"/>
-			<category-def>
-				<xsl:attribute name="name">
-					<xsl:text>cdt_</xsl:text>
-					<xsl:value-of select="$version"/>
-				</xsl:attribute>
-				<xsl:attribute name="label">
-					<xsl:text>CDT Build </xsl:text>
-					<xsl:value-of select="$version"/>
-				</xsl:attribute>
-			</category-def>
-			<feature id="org.eclipse.cdt">
-				<xsl:attribute name="url">
-					<xsl:text>features/org.eclipse.cdt_</xsl:text>
-					<xsl:value-of select="$version"/>
-					<xsl:text>.jar</xsl:text>
-				</xsl:attribute>
-				<xsl:attribute name="version">
-					<xsl:value-of select="$version"/>
-				</xsl:attribute>
-				<category>
-					<xsl:attribute name="name">
-						<xsl:text>cdt_</xsl:text>
-						<xsl:value-of select="$version"/>
-					</xsl:attribute>
-				</category>
-			</feature>
-			<feature id="org.eclipse.cdt.sdk">
-				<xsl:attribute name="url">
-					<xsl:text>features/org.eclipse.cdt.sdk_</xsl:text>
-					<xsl:value-of select="$version"/>
-					<xsl:text>.jar</xsl:text>
-				</xsl:attribute>
-				<xsl:attribute name="version">
-					<xsl:value-of select="$version"/>
-				</xsl:attribute>
-				<category>
-					<xsl:attribute name="name">
-						<xsl:text>cdt_</xsl:text>
-						<xsl:value-of select="$version"/>
-					</xsl:attribute>
-				</category>
-			</feature>
-		</site>
-	</xsl:template>
-	
-</xsl:transform>
diff --git a/releng/org.eclipse.cdt.releng/upload.sh b/releng/org.eclipse.cdt.releng/upload.sh
new file mode 100644
index 00000000000..aac8f3a14d9
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/upload.sh
@@ -0,0 +1,11 @@
+# This script must be run from the directory you want to upload
+
+# Arguments
+#  $1 - username
+#  $2 - password
+#  $3 - target URL
+
+for i in *
+do
+	curl --ftp-create-dirs -u$1:$2 -T $i $3
+done