diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index ab61a922246..46a347f1ff7 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -87,24 +87,6 @@
 	</target>
 	
 	<target name="zips" depends="init,unzip">
-		<!--ant antfile="build.xml" dir="${pde.build.scripts}">
-			<property name="builder" value="${basedir}/platform" />
-		</ant>
-		<ant antfile="build.xml" dir="${pde.build.scripts}">
-			<property name="builder" value="${basedir}/sdk" />
-		</ant>
-		<ant antfile="build.xml" dir="${pde.build.scripts}">
-			<property name="builder" value="${basedir}/gdbjtag" />
-		</ant>
-		<ant antfile="build.xml" dir="${pde.build.scripts}">
-			<property name="builder" value="${basedir}/c99" />
-		</ant>
-		<ant antfile="build.xml" dir="${pde.build.scripts}">
-			<property name="builder" value="${basedir}/upc" />
-		</ant>
-		<ant antfile="build.xml" dir="${pde.build.scripts}">
-			<property name="builder" value="${basedir}/xlc" />
-		</ant-->
 		<ant antfile="build.xml" dir="${pde.build.scripts}">
 			<property name="builder" value="${basedir}/master" />
 		</ant>
@@ -120,6 +102,20 @@
 			<replacefilter token="@branchVersion@" value="${branchVersion}"/>
 			<replacefilter token="@buildId@" value="${buildId}"/>
 		</replace>
+		<rename dest="${buildDirectory}/cdt-master-${branchVersion}-${buildId}.zip"
+			src="${zipsdir}/cdt-master-${branchVersion}-${buildId}.zip"/>
+		<unzip src="${buildDirectory}/cdt-master-${branchVersion}-${buildId}.zip" dest="${buildDirectory}/site"/>
+		<rename dest="${buildDirectory}/site/eclipse/epl-v10.html"
+			src="${buildDirectory}/site/linux.x86.gtk/epl-v10.html"/>
+		<rename dest="${buildDirectory}/site/eclipse/notice.html"
+			src="${buildDirectory}/site/linux.x86.gtk/notice.html"/>
+		<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}"/>
+		</replace>
+		<zip destfile="${zipsdir}/${branchVersion}-${buildId}.zip" 
+			basedir="${buildDirectory}/site/eclipse"/>
 	</target>
 
 	<target name="unpackzip" if="onWindows">
diff --git a/releng/org.eclipse.cdt.releng/buildindex.html b/releng/org.eclipse.cdt.releng/buildindex.html
index 1eef116bb98..0c13f03ecba 100644
--- a/releng/org.eclipse.cdt.releng/buildindex.html
+++ b/releng/org.eclipse.cdt.releng/buildindex.html
@@ -8,222 +8,18 @@
 <p><a href="compilelog.txt">Compile Log</a></p>
 <p><a href="junits.html">JUnit Results</a></p>
 <h3>CDT Master Feature</h3>
-<p>This feature has everything</p>
-<table cellpadding="2" cellspacing="2" border="1"
- style="text-align: left; width: 100%;">
-  <tbody>
-    <tr>
-      <td style="vertical-align: top;">All</td>
-      <td style="vertical-align: top;">
-        <a href="cdt-master-@branchVersion@-@buildId@.zip">cdt-gdbjtag-@branchVersion@-@buildId@.zip</a><br>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<h3>CDT Runtime Feature</h3>
-<p>includes editor, search, builders, launch, debug, gnu toolchain
-integrations for build/debug, user documentation<br>
+<p>This feature has everything, including:</p>
+<ul>
+<li>CDT Runtime Feature - includes editor, search, builders, launch, debug, gnu toolchain integrations for build/debug, user documentation</li>
+<li>CDT SDK Feature - superset of runtime that adds source and extension point schemas</li>
+<li>GDB Hardware Debugging - Provides a launch configuration for launching gdb to do hardware debugging.</li>
+<li>XL C/C++ Compiler Support - Provides an error parser and managed build support for IBM's XL C/C++ compilers.</li>
+<li>ISO C99 Support - Provides a parser for the ISO/IEC 9899:1999 variant of the C programming language (aka C99), generated from a grammar using the LPG parser generator.  The grammar can be reused and extended to create your own parser for variants on the C programming language.</li>
+<li>Unified Parallel C Support - Provides support for the Unified Parallel C programming langugage.  Provides parsing/indexing infrastructure and language definition, allowing the UPC language to be recognized by CDT.  Requires the C99 parser feature.</li>
+<li>CDT Testing Feature - includes all test plugins required for running automated JUnit tests</li>
+</ul>
+<p>
+<a href="cdt-master-@branchVersion@-@buildId@.zip">cdt-master-@branchVersion@-@buildId@.zip</a>
 </p>
-<table cellpadding="2" cellspacing="2" border="1"
- style="text-align: left; width: 100%;">
-  <tbody>
-    <tr>
-      <td style="vertical-align: top;">AIX/ppc</td>
-      <td style="vertical-align: top;">
-        <a href="cdt-@branchVersion@-@buildId@-aix.ppc.tar.gz">cdt-@branchVersion@-@buildId@-aix.ppc.tar.gz</a><br>
-      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Linux/x86<br>
-      </td>
-      <td style="vertical-align: top;">
-        <a href="cdt-@branchVersion@-@buildId@-linux.x86.tar.gz">cdt-@branchVersion@-@buildId@-linux.x86.tar.gz</a>
-      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Linux/x86_64<br>
-      </td>
-      <td style="vertical-align: top;">
-        <a href="cdt-@branchVersion@-@buildId@-linux.x86_64.tar.gz">cdt-@branchVersion@-@buildId@-linux.x86_64.tar.gz</a>
-      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Linux/ppc<br>
-      </td>
-      <td style="vertical-align: top;">
-        <a href="cdt-@branchVersion@-@buildId@-linux.ppc.tar.gz">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="cdt-@branchVersion@-@buildId@-linux.ia64.tar.gz">cdt-@branchVersion@-@buildId@-linux.ia64.tar.gz</a>
-      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">MacOSX/ppc<br>
-      </td>
-      <td style="vertical-align: top;">
-        <a href="cdt-@branchVersion@-@buildId@-macosx.ppc.tar.gz">cdt-@branchVersion@-@buildId@-macosx.ppc.tar.gz</a><br>
-      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">QNX/x86<br>
-      </td>
-      <td style="vertical-align: top;">
-        <a href="cdt-@branchVersion@-@buildId@-qnx.x86.tar.gz">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="cdt-@branchVersion@-@buildId@-solaris.sparc.tar.gz">cdt-@branchVersion@-@buildId@-solaris.sparc.tar.gz</a><br>
-      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Win32/x86<br>
-      </td>
-      <td style="vertical-align: top;">
-        <a href="cdt-@branchVersion@-@buildId@-win32.x86.zip">cdt-@branchVersion@-@buildId@-win32.x86.zip</a><br>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<br>
-<h3>CDT SDK Feature</h3>
-<p>superset of runtime that adds source and extension point schemas</p>
-<table cellpadding="2" cellspacing="2" border="1"
- style="text-align: left; width: 100%;">
-  <tbody>
-    <tr>
-      <td style="vertical-align: top;">AIX/ppc</td>
-      <td style="vertical-align: top;">
-        <a href="cdt-SDK-@branchVersion@-@buildId@-aix.ppc.tar.gz">cdt-SDK-@branchVersion@-@buildId@-aix.ppc.tar.gz</a><br>
-      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Linux/x86<br>
-      </td>
-      <td style="vertical-align: top;">
-        <a href="cdt-SDK-@branchVersion@-@buildId@-linux.x86.tar.gz">cdt-SDK-@branchVersion@-@buildId@-linux.x86.tar.gz</a></td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Linux/x86_64<br>
-      </td>
-      <td style="vertical-align: top;">
-        <a href="cdt-SDK-@branchVersion@-@buildId@-linux.x86_64.tar.gz">cdt-SDK-@branchVersion@-@buildId@-linux.x86_64.tar.gz</a>
-      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Linux/ppc<br>
-      </td>
-      <td style="vertical-align: top;">
-        <a href="cdt-SDK-@branchVersion@-@buildId@-linux.ppc.tar.gz">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="cdt-SDK-@branchVersion@-@buildId@-linux.ia64.tar.gz">cdt-SDK-@branchVersion@-@buildId@-linux.ia64.tar.gz</a>
-      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">MacOSX/ppc<br>
-      </td>
-      <td style="vertical-align: top;">
-        <a href="cdt-SDK-@branchVersion@-@buildId@-macosx.ppc.tar.gz">cdt-SDK-@branchVersion@-@buildId@-macosx.ppc.tar.gz</a><br>
-      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">QNX/x86<br>
-      </td>
-      <td style="vertical-align: top;">
-        <a href="cdt-SDK-@branchVersion@-@buildId@-qnx.x86.tar.gz">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="cdt-SDK-@branchVersion@-@buildId@-solaris.sparc.tar.gz">cdt-SDK-@branchVersion@-@buildId@-solaris.sparc.tar.gz</a><br>
-      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Win32/x86<br>
-      </td>
-      <td style="vertical-align: top;">
-        <a href="cdt-SDK-@branchVersion@-@buildId@-win32.x86.zip">cdt-SDK-@branchVersion@-@buildId@-win32.x86.zip</a><br>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<h3>GDB Hardware Debugging</h3>
-<p>Provides a launch configuration for launching gdb to do hardware debugging.</p>
-<table cellpadding="2" cellspacing="2" border="1"
- style="text-align: left; width: 100%;">
-  <tbody>
-    <tr>
-      <td style="vertical-align: top;">All</td>
-      <td style="vertical-align: top;">
-        <a href="cdt-gdbjtag-@branchVersion@-@buildId@.zip">cdt-gdbjtag-@branchVersion@-@buildId@.zip</a><br>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<h3>XL C/C++ Compiler Support</h3>
-<p>Provides an error parser and managed build support for IBM's XL C/C++ compilers.</p>
-<table cellpadding="2" cellspacing="2" border="1"
- style="text-align: left; width: 100%;">
-  <tbody>
-    <tr>
-      <td style="vertical-align: top;">All</td>
-      <td style="vertical-align: top;">
-        <a href="cdt-xlc-@branchVersion@-@buildId@.zip">cdt-xlc-@branchVersion@-@buildId@.zip</a><br>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<h3>ISO C99 Support</h3>
-<p>Provides a parser for the ISO/IEC 9899:1999 variant of the C programming language (aka C99), generated from a grammar using the LPG parser generator.  The grammar can be reused and extended to create your own parser for variants on the C programming language.</p>
-<table cellpadding="2" cellspacing="2" border="1"
- style="text-align: left; width: 100%;">
-  <tbody>
-    <tr>
-      <td style="vertical-align: top;">All</td>
-      <td style="vertical-align: top;">
-        <a href="cdt-c99-@branchVersion@-@buildId@.zip">cdt-c99-@branchVersion@-@buildId@.zip</a><br>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<h3>Unified Parallel C Support</h3>
-<p>Provides support for the Unified Parallel C programming langugage.  Provides parsing/indexing infrastructure and language definition, allowing the UPC language to be recognized by CDT.  Requires the C99 parser feature.</p>
-<table cellpadding="2" cellspacing="2" border="1"
- style="text-align: left; width: 100%;">
-  <tbody>
-    <tr>
-      <td style="vertical-align: top;">All</td>
-      <td style="vertical-align: top;">
-        <a href="cdt-upc-@branchVersion@-@buildId@.zip">cdt-upc-@branchVersion@-@buildId@.zip</a><br>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<h3>CDT Testing Feature</h3>
-<p>includes all test plugins required for running automated JUnit tests</p>
-<table cellpadding="2" cellspacing="2" border="1"
- style="text-align: left; width: 100%;">
-  <tbody>
-    <tr>
-      <td style="vertical-align: top;">All</td>
-      <td style="vertical-align: top;">
-        <a href="cdt-testing-@branchVersion@-@buildId@.zip">cdt-testing-@branchVersion@-@buildId@.zip</a><br>
-      </td>
-    </tr>
-  </tbody>
-</table>
 </body>
 </html>
diff --git a/releng/org.eclipse.cdt.releng/buildsite.xml b/releng/org.eclipse.cdt.releng/buildsite.xml
new file mode 100644
index 00000000000..319c1f9b532
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/buildsite.xml
@@ -0,0 +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@"/>
+	</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>
+	<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>
+	<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>
+	<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>
+	<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>
+	<feature id="org.eclipse.cdt.testing" url="features/org.eclipse.cdt.testing_@branchVersion@.@buildId@.jar" version="@branchVersion@.@buildId@">
+		<category name="CDT @branchVersion@.@buildId@"/>
+	</feature>
+</site>