diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 44492288ba5..4b785f4b17d 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -108,10 +108,12 @@
 		<move file="${buildDirectory}/site/linux.gtk.x86/eclipse/notice.html" todir="${buildDirectory}/site/eclipse"/>
 		<copy file="buildsite.xml" tofile="${buildDirectory}/site/eclipse/site.xml"/>
 		<replace file="${buildDirectory}/site/eclipse/site.xml">
-			<replacefilter token="@branchVersion@" value="${branchVersion}"/>
-			<replacefilter token="@buildId@" value="${buildId}"/>
+			<replacefilter token="@buildVersion@" value="${branchVersion}.${timestamp}"/>
 		</replace>
-		<zip destfile="${zipsdir}/${branchVersion}-${buildId}.zip" 
+		<!-- for some reason LPG isn't getting picked up-->
+		<copy file="${buildDirectory}/plugins/net.sourceforge.lpg.lpgjavaruntime_1.1.0.v200702061926.jar"
+			todir="${buildDirectory}/site/eclipse/plugins"/>
+		<zip destfile="${zipsdir}/cdt-master-${branchVersion}-${buildId}.zip" 
 			basedir="${buildDirectory}/site/eclipse"/>
 	</target>
 
@@ -130,9 +132,6 @@
 	</target>
 	
 	<target name="test" depends="init" unless="hasErrors">
-		<ant antfile="build.xml" dir="${pde.build.scripts}">
-			<property name="builder" value="${basedir}/testing" />
-		</ant>
 		<antcall target="unpack">
 			<param name="srcPrefix" value="${zipsdir}/cdt-${branchVersion}-${buildId}-${osgi.os}.${osgi.arch}"/>
 			<param name="dest" value="${buildDirectory}"/>
diff --git a/releng/org.eclipse.cdt.releng/buildsite.xml b/releng/org.eclipse.cdt.releng/buildsite.xml
index 319c1f9b532..fbc139fb280 100644
--- a/releng/org.eclipse.cdt.releng/buildsite.xml
+++ b/releng/org.eclipse.cdt.releng/buildsite.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-	<category-def name="CDT @branchVersion@.@buildId@" label="CDT @branchVersion@.@buildId@"/>
-	<feature id="org.eclipse.cdt" url="features/org.eclipse.cdt_@branchVersion@.@buildId@.jar" version="@branchVersion@.@buildId@">
-		<category name="CDT @branchVersion@.@buildId@"/>
+	<category-def name="CDT @buildVersion@" label="CDT @buildVersion@"/>
+	<feature id="org.eclipse.cdt" url="features/org.eclipse.cdt_@buildVersion@.jar" version="@buildVersion@">
+		<category name="CDT @buildVersion@"/>
 	</feature>
-	<feature id="org.eclipse.cdt.sdk" url="features/org.eclipse.cdt.sdk_@branchVersion@.@buildId@.jar" version="@branchVersion@.@buildId@">
-		<category name="CDT @branchVersion@.@buildId@"/>
+	<feature id="org.eclipse.cdt.sdk" url="features/org.eclipse.cdt.sdk_@buildVersion@.jar" version="@buildVersion@">
+		<category name="CDT @buildVersion@"/>
 	</feature>
-	<feature id="org.eclipse.cdt.debug.gdbjtag" url="features/org.eclipse.cdt.debug.gdbjtag_@branchVersion@.@buildId@.jar" version="@branchVersion@.@buildId@">
-		<category name="CDT @branchVersion@.@buildId@"/>
+	<feature id="org.eclipse.cdt.debug.gdbjtag" url="features/org.eclipse.cdt.debug.gdbjtag_@buildVersion@.jar" version="@buildVersion@">
+		<category name="CDT @buildVersion@"/>
 	</feature>
-	<feature id="org.eclipse.cdt.core.parser.c99.feature" url="features/org.eclipse.cdt.core.parser.c99.feature_@branchVersion@.@buildId@.jar" version="@branchVersion@.@buildId@">
-		<category name="CDT @branchVersion@.@buildId@"/>
+	<feature id="org.eclipse.cdt.core.parser.c99.feature" url="features/org.eclipse.cdt.core.parser.c99.feature_@buildVersion@.jar" version="@buildVersion@">
+		<category name="CDT @buildVersion@"/>
 	</feature>
-	<feature id="org.eclipse.cdt.core.parser.upc.feature" url="features/org.eclipse.cdt.core.parser.upc.feature_@branchVersion@.@buildId@.jar" version="@branchVersion@.@buildId@">
-		<category name="CDT @branchVersion@.@buildId@"/>
+	<feature id="org.eclipse.cdt.core.parser.upc.feature" url="features/org.eclipse.cdt.core.parser.upc.feature_@buildVersion@.jar" version="@buildVersion@">
+		<category name="CDT @buildVersion@"/>
 	</feature>
-	<feature id="org.eclipse.cdt.xlc.feature" url="features/org.eclipse.cdt.xlc.feature_@branchVersion@.@buildId@.jar" version="@branchVersion@.@buildId@">
-		<category name="CDT @branchVersion@.@buildId@"/>
+	<feature id="org.eclipse.cdt.xlc.feature" url="features/org.eclipse.cdt.xlc.feature_@buildVersion@.jar" version="@buildVersion@">
+		<category name="CDT @buildVersion@"/>
 	</feature>
-	<feature id="org.eclipse.cdt.testing" url="features/org.eclipse.cdt.testing_@branchVersion@.@buildId@.jar" version="@branchVersion@.@buildId@">
-		<category name="CDT @branchVersion@.@buildId@"/>
+	<feature id="org.eclipse.cdt.testing" url="features/org.eclipse.cdt.testing_@buildVersion@.jar" version="@buildVersion@">
+		<category name="CDT @buildVersion@"/>
 	</feature>
 </site>