diff --git a/product/installer/build.xml b/product/installer/build.xml
index 53f69fe..f92e86f 100644
--- a/product/installer/build.xml
+++ b/product/installer/build.xml
@@ -258,7 +258,7 @@ $Id: build.xml,v 1.1.2.14 2006/03/31 07:47:31 starksm Exp $
     </tstamp>
 
     <!-- given 7.0.0, return 7 -->
-     <propertyregex property="version.major" input="${JBDS_VERSION}" regexp="([0-9]+)\.([0-9]+)\.([0-9]+)" select="\1" casesensitive="false" />
+    <propertyregex property="version.major" input="${update.site.version}" regexp="([0-9]+)\.([0-9]+)\.([0-9]+)" select="\1" casesensitive="false" />
 
     <copy todir="${distribution.dir}/config" filtering="true" >
       <fileset dir="${src.dir}/config">
@@ -270,12 +270,12 @@ $Id: build.xml,v 1.1.2.14 2006/03/31 07:47:31 starksm Exp $
       </fileset>
       <filterset id="resources.filterset">
         <!-- [JBIDE-4200] full_version is now just x.y.z; for R builds get x.y.z.GA; all others get x.y.z.vYYYYMMDDhhmmN-H123-M4 -->
-        <filter token="full_version" value="${JBDS_VERSION}" />
-        <filter token="version_name" value="${JBDS_VERSION}.${BUILD_ALIAS}" />
+        <filter token="full_version" value="${update.site.version}" />
+        <filter token="version_name" value="${update.site.version}.${BUILD_ALIAS}" />
         <filter token="major_version" value="${version.major}" />
-        <filter token="version_string" value="${JBDS_VERSION}.${BUILD_ALIAS}" />
+        <filter token="version_string" value="${update.site.version}.${BUILD_ALIAS}" />
         <filter token="nightly_build_qualifier" value="${nightly_build_qualifier}" />
-        <filter token="specification.version.presentstring" value="${JBDS_VERSION}.${BUILD_ALIAS}"/>
+        <filter token="specification.version.presentstring" value="${update.site.version}.${BUILD_ALIAS}"/>
         <filter token="buildDate" value="${buildDate}" />
       </filterset>
     </copy>
@@ -299,19 +299,21 @@ $Id: build.xml,v 1.1.2.14 2006/03/31 07:47:31 starksm Exp $
   </target>
 
   <target name="init-properties">
+    <propertyregex property="update.site.version" defaultvalue="${project.version}" input="${project.version}" regexp="-SNAPSHOT" replace="" override="true" />
+
     <!-- 2.1.0.v200909091234R-H123-GA -->
     <property name="specification.version"
-              value="${JBDS_VERSION}.${buildQualifier}" />
+              value="${update.site.version}.${buildQualifier}" />
 
     <property name="installer.name" value="jbdevstudio-product-${platform.name}-${specification.version}" />
     <property name="installer.eap.name" value="jbdevstudio-product-eap-${platform.name}-${specification.version}" />
 
     <property name="specification.vendor" value="JBoss by Red Hat (http://www.jboss.com/)" />
-    <property name="specification.version.presentstring" value="${JBDS_VERSION}.${BUILD_ALIAS}" />
-    <property name="implementation.title" value="JBDS Installer [${JBDS_VERSION}]" />
+    <property name="specification.version.presentstring" value="${update.site.version}.${BUILD_ALIAS}" />
+    <property name="implementation.title" value="JBDS Installer [${update.site.version}]" />
     <property name="implementation.url" value="http://www.jboss.org/" />
     <property name="implementation.version"
-              value="${JBDS_VERSION}.${buildQualifier}" />
+              value="${update.site.version}.${buildQualifier}" />
   </target>
 
   <target name="installer" depends="init-properties, buildcustompanels, prepare-distribution">
diff --git a/product/installer/pom.xml b/product/installer/pom.xml
index 30f7b0b..c19fc0c 100644
--- a/product/installer/pom.xml
+++ b/product/installer/pom.xml
@@ -32,7 +32,6 @@
     </repository>
   </repositories>
 
-
   <build>
     <plugins>
       <plugin>
@@ -200,7 +199,7 @@
                   <property name="buildQualifier" value="${buildQualifier}" />
                   <property name="product.buildType" value="R" />
                   <!-- properties previously included in version.properties -->
-                  <property name="JBDS_VERSION" value="${JBDS_VERSION}"/>
+                  <property name="project.version" value="${project.version}" />
                   <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/>
                 </ant>
                 <!-- clean up build-time artifacts so they won't be published -->
diff --git a/product/pom.xml b/product/pom.xml
index ef9b251..b2418c0 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -13,24 +13,6 @@
   <version>7.0.0-SNAPSHOT</version>
   <name>JBDS - Product, Installers</name>
   <packaging>pom</packaging>
-	<!--
-	     Build product features, site, and installers here:
-
-		mvn clean install -P maximum,jboss-requirements-composite-extras-mirror
-
-	     Installers are in installer/target/ and can be installed using 'java -jar jbdevstudio-*.jar'
-
-	     To update from one version of JBDS to another:
-
-		Help > Install from the generated site in site/target/repository/
-		uncheck the box for 'Group items by category'
-		select the "JBoss Developer Studio (Branded Product)" feature
-
-	     Or, to install the "Bring Your Own Eclipse" category or "Core Features" feature into Eclipse (not as an update to an existing JBDS install):
-
-		Help > Install from the generated site in site/target/repository/
-		select the "JBoss Developer Studio (Core Features)" feature
-	-->
   <modules>
     <module>plugins</module>
     <module>features</module>
@@ -39,9 +21,7 @@
     <module>sources</module>
     <module>results</module>
   </modules>
-
   <properties>
-		<JBDS_VERSION>7.0.0</JBDS_VERSION>
     <targetPlatformGroup>jbdevstudio</targetPlatformGroup>
     <tpc.group>jbdevstudio</tpc.group>
   </properties>
@@ -95,3 +75,22 @@
   </pluginRepositories>
 </project>
 
+  <!--
+       Build product features, site, and installers here:
+
+    mvn clean install -P maximum,jboss-requirements-composite-extras-mirror \
+      -DBUILD_NUMBER=1234 -DJOB_NAME=devstudio.product_trunk -Dupdate.site.description="Development Milestone"
+
+       Installers are in installer/target/ and can be installed using 'java -jar jbdevstudio-*.jar'
+
+       To update from one version of JBDS to another:
+
+    Help > Install from the generated site in site/target/repository/
+    uncheck the box for 'Group items by category'
+    select the "JBoss Developer Studio (Branded Product)" feature
+
+       Or, to install the "Bring Your Own Eclipse" category or "Core Features" feature into Eclipse (not as an update to an existing JBDS install):
+
+    Help > Install from the generated site in site/target/repository/
+    select the "JBoss Developer Studio (Core Features)" feature
+  -->
diff --git a/product/results/build.xml b/product/results/build.xml
index 95162b2..19a81ff 100644
--- a/product/results/build.xml
+++ b/product/results/build.xml
@@ -6,6 +6,8 @@
 
   <property name="tmpdir" value="${java.io.tmpdir}/jbds-results-build" />
 
+  <property name="project.build.directory" value="${output.dir}/target"/>
+
   <target name="init">
     <echo level="verbose">
 This script requires Ant 1.8+ and JDK 1.6+.
@@ -23,78 +25,48 @@ $java.home = ${java.home}</echo>
 
   <target name="build" depends="init">
 
-    <!-- pass in the following variables from Maven -->
-    <condition property="update.site.description_STRING" value="Nightly Build" else="${update.site.description}">
-      <contains string="${update.site.description}" substring="update.site.description" />
-    </condition>
+    <!-- should be set already by Jenkins, but for local builds set a default -->
+    <property name="JOB_NAME" value="devstudio.product_trunk"/>
+    <property name="update.site.description" value="Local Build"/>
 
-    <property name="JOB_NAME" value=""/>
-    <condition property="JBDS_VERSION_STRING" value="" else="${JBDS_VERSION}">
-      <contains string="${JBDS_VERSION}" substring="JBDS_VERSION" />
-    </condition>
-    <!-- <if>
-      <contains string="${TIMESTAMP}" substring="TIMESTAMP"/>
+    <!-- get timestamp from upstream installer build (units.unit.id = Alpha2-v20130326-1416-B6969.jbds) instead of maven since tycho and pure maven don't use the same value -->
+    <if>
+      <available file="../installer/target/p2content.xml"/>
       <then>
-        <var name="TIMESTAMP" unset="true"/>
-        <var name="TIMESTAMP" value="${maven.build.timestamp}"/>
+        <xmlproperty file="../installer/target/p2content.xml" collapseAttributes="true"/>
+        <propertyregex property="update.site.qualifier" defaultvalue="${units.unit.id}" input="${units.unit.id}" regexp=".jbds" replace="" override="true" />
+      </then>
+      <else>
         <if>
-          <contains string="${TIMESTAMP}" substring="maven.build.timestamp"/>
+          <isset property="BUILD_NUMBER"/>
           <then>
-            <tstamp>
-              <format property="TIMESTAMP" pattern="yyyyMMdd-HHmm" locale="en,US" timezone="GMT"/>
-            </tstamp>
+            <var name="update.site.qualifier" value="${update.site.qualifier}-B${BUILD_NUMBER}"/>
           </then>
         </if>
-      </then>
-    </if> -->
-    <condition property="BUILD_NUMBER_STRING" value="" else="${BUILD_NUMBER}">
-      <contains string="${BUILD_NUMBER}" substring="BUILD_NUMBER" />
-    </condition>
-    <condition property="BUILD_ALIAS_STRING" value="" else="${BUILD_ALIAS}">
-      <contains string="${BUILD_ALIAS}" substring="BUILD_ALIAS" />
-    </condition>
+      </else>
+    </if>
 
-    <!--<condition property="qualifier" value="${JBDS_VERSION_STRING}.v${TIMESTAMP}-${BUILD_ALIAS_STRING}" 
-      else="${JBDS_VERSION_STRING}.v${TIMESTAMP}-H${BUILD_NUMBER_STRING}-${BUILD_ALIAS_STRING}">
-      <contains string="${BUILD_NUMBER}" substring="BUILD_NUMBER" />
-    </condition> -->
+    <propertyregex property="update.site.version" defaultvalue="${project.version}" input="${project.version}" regexp="-SNAPSHOT" replace="" override="true" />
 
     <path id="jbds-installer-universal-file-id"><fileset dir="../installer/target"><include name="jbdevstudio-product-universal-*.jar"/></fileset></path><property name="jbds-installer-universal-file" refid="jbds-installer-universal-file-id"/>
     <path id="jbds-installer-eap-universal-file-id"><fileset dir="../installer/target"><include name="jbdevstudio-product-eap-universal-*.jar"/></fileset></path><property name="jbds-installer-eap-universal-file" refid="jbds-installer-eap-universal-file-id"/>
 
-    <propertyregex property="qualifier" input="${jbds-installer-universal-file}" defaultvalue="${jbds-installer-universal-file}" regexp=".+jbdevstudio-product-universal-(.+).jar" select="\1" override="true"/>
-    <echo level="verbose">qualifier = ${qualifier}</echo>
-    <if>
-      <contains string="${TIMESTAMP}" substring="TIMESTAMP"/>
-      <then>
-        <var name="TIMESTAMP" unset="true"/>
-        <propertyregex property="TIMESTAMP" input="${jbds-installer-universal-file}" defaultvalue="${jbds-installer-universal-file}" regexp=".+jbdevstudio-product-universal-.+v(\d{8}-\d{4}).*.jar" select="\1" override="true"/>
-      </then>
-    </if>
-    <echo level="verbose">TIMESTAMP = ${TIMESTAMP}</echo>
+    <echo level="verbose">update.site.version = ${update.site.version}, update.site.qualifier = ${update.site.qualifier}</echo>
 
+    <!-- no longer needed; just copy the file to the right folder -->
     <path id="jbds-all-sources-file-id"><fileset dir="../sources/target"><include name="jbdevstudio-product-sources-*.zip"/></fileset></path><property name="jbds-all-sources-file" refid="jbds-all-sources-file-id"/>
-
     <if>
       <available file="${jbds-all-sources-file}" type="file"/>
       <then>
-        <!-- because sources zip is built upstream from this process, it gets a different timestamp/qualifier. Need this to rename it -->
-        <echo level="debug">1. jbds-all-sources-file = ${jbds-all-sources-file}</echo>
-        <if>
-          <not><contains string="${jbds-all-sources-file}" substring="${qualifier}"/></not>
-          <then>
-            <move file="${jbds-all-sources-file}" tofile="target/jbdevstudio-product-sources-${qualifier}.zip" preservelastmodified="true"/>
+        <copy verbose="false" file="${jbds-all-sources-file}" tofile="${project.build.directory}/jbdevstudio-product-sources-${update.site.version}.${update.site.qualifier}.zip" preservelastmodified="true"/>
         <var name="jbds-all-sources-file" unset="true"/>
-            <path id="jbds-all-sources-file-id2"><fileset dir="target"><include name="jbdevstudio-product-sources-*.zip"/></fileset></path><property name="jbds-all-sources-file" refid="jbds-all-sources-file-id2"/>
-          </then>
-        </if>
-        <echo level="debug">2. jbds-all-sources-file = ${jbds-all-sources-file}</echo>
-        <!-- because sources zip is built upstream from this process, it gets a different timestamp/qualifier. Need this to rename it -->
+        <path id="jbds-all-sources-file-id2"><fileset dir="target"><include name="jbdevstudio-product-sources-*.zip"/></fileset></path>
+        <property name="jbds-all-sources-file" refid="jbds-all-sources-file-id2"/>
       </then>
     </if>
 
     <!-- special case: copy the site_assembly.zip to target folder; the rest need not be moved -->
-    <property name="jbds-update-file" value="${basedir}/target/jbdevstudio-product-Update-${qualifier}.zip"/>
+    <property name="jbds-update-file" value="${basedir}/target/jbdevstudio-product-Update-${update.site.version}.${update.site.qualifier}.zip"/>
     <if>
       <available file="../site/target/site_assembly.zip" type="file"/>
       <then>
@@ -102,81 +74,13 @@ $java.home = ${java.home}</echo>
       </then>
     </if>
 
-    <antcall target="generate.html" />
+    <antcall target="create.jbds.results.html">
+      <param name="update.site.qualifier" value="${update.site.qualifier}"/>
+    </antcall>
 
     <antcall target="cleanup" />
   </target>
 
-  <target name="generate.html">
-    <echo>Generate index pages using qualifier = ${qualifier}</echo>
-    <for list="jbds-installer-universal-file,jbds-installer-eap-universal-file,jbds-all-sources-file,jbds-update-file" param="this">
-      <sequential>
-        <if>
-          <available file="${@{this}}" type="file"/>
-          <then>
-            <checksum file="${@{this}}"/>
-            <loadfile srcfile="${@{this}}.MD5" property="@{this}-md5" failonerror="true" />
-            <get.size file="${@{this}}" property="@{this}-size" />
-            <basename file="${@{this}}" property="@{this}-name" />
-            <echo level="verbose">@{this} = ${@{this}}
-  :: ${@{this}-name}, ${@{this}-size}M, ${@{this}-md5}</echo>
-          </then>
-        </if>
-      </sequential>
-    </for>
-
-    <!-- replace links to jobs w/ correct stream (eg., 3.4_stable_branch, 4.0_stable_branch or 4.0_trunk) -->
-    <condition property="STREAM_SUFFIX" value="_stable_branch" else="_trunk">
-      <contains string="${JOB_NAME}" substring="_stable_branch" />
-    </condition>
-    <condition property="STREAM_NAME" value="6.0.indigo" else="Trunk">
-      <contains string="${JOB_NAME}" substring="_stable_branch" />
-    </condition>
-
-    <condition property="WARNING" value="This nightly build is a direct build from SVN/CVS and is provided as-is with no guarantees. Be advised that while there is no prior proof, if this build sets fire to your computer, you were sufficiently warned!" else="This build has been deemed by the JBossTools team to be in good working condition. Please note that this build may be a developer release, and if so should be treated with slightly more understanding and care than a stable release. Please see the release notes on JIRA and/or Sourceforge for further information.">
-      <contains string="${update.site.description_STRING}" substring="Nightly"/>
-    </condition>
-
-    <!-- set IDs for the chart widgets from the views -->
-    <!-- TODO: will later need to add a third case for 6.0 stable_branch -->
-    <condition property="PORTLET.1" value="209" else="83">
-      <contains string="${JOB_NAME}" substring="_stable_branch" />
-    </condition>
-    <condition property="PORTLET.2" value="210" else="84">
-      <contains string="${JOB_NAME}" substring="_stable_branch" />
-    </condition>
-
-    <!-- use locally built files with relative paths -->
-    <copy todir="target/" overwrite="true">
-      <fileset file="index-local-template.html" />
-      <mapper type="merge" to="local.html" />
-      <filterchain>
-        <expandproperties />
-      </filterchain>
-    </copy>
-
-    <!-- flatten paths and use filename instead of file; instead of absolute path, use simply .  -->
-    <!-- <var name="PREFIX" value="http://www.qa.jboss.com/binaries/RHDS/builds/staging/${JOB_NAME}/installer"/> -->
-    <var name="PREFIX" value="."/>
-    <copy todir="target/" overwrite="true">
-      <fileset file="index-internal-template.html" />
-      <mapper type="merge" to="index.html" />
-      <filterchain>
-        <expandproperties />
-      </filterchain>
-    </copy>
-
-    <!-- flatten paths and use filename instead of file -->
-    <var name="PREFIX" value="/earlyaccess/builds/development/${JBDS_VERSION_STRING}.${BUILD_ALIAS_STRING}"/>
-    <copy todir="target/" overwrite="true">
-      <fileset file="index-earlyaccess-template.html" />
-      <mapper type="merge" to="${JBDS_VERSION_STRING}.${BUILD_ALIAS_STRING}.html" />
-      <filterchain>
-        <expandproperties />
-      </filterchain>
-    </copy>
-  </target>
-
   <target name="cleanup">
     <delete includeemptydirs="true" quiet="true">
       <fileset dir="${tmpdir}" />
@@ -220,4 +124,117 @@ $java.home = ${java.home}</echo>
     </sequential>
   </macrodef>  
 
+  <target name="create.jbds.results.html">
+    <for list="jbds-installer-universal-file,jbds-installer-eap-universal-file,jbds-all-sources-file,jbds-update-file" param="this">
+      <sequential>
+        <if>
+          <available file="${@{this}}" type="file"/>
+          <then>
+            <checksum file="${@{this}}"/>
+            <loadfile srcfile="${@{this}}.MD5" property="@{this}-md5" failonerror="true" />
+            <get.size file="${@{this}}" property="@{this}-size" />
+            <basename file="${@{this}}" property="@{this}-name" />
+            <echo level="verbose">@{this} = ${@{this}}
+  :: ${@{this}-name}, ${@{this}-size}M, ${@{this}-md5}</echo>
+          </then>
+        </if>
+      </sequential>
+    </for>
+
+    <!-- use locally built files with relative paths -->
+    <antcall target="create.results.html">
+      <param name="update.site.qualifier" value="${update.site.qualifier}"/>
+      <param name="PREFIX" value="../../installer/target"/>
+      <param name="input" value="index-local-template.html"/>
+      <param name="output" value="local.html"/>
+    </antcall>
+    <!-- flatten paths and use filename instead of file; instead of absolute path, use simply .  -->
+    <antcall target="create.results.html">
+      <param name="update.site.qualifier" value="${update.site.qualifier}"/>
+      <param name="PREFIX" value="."/>
+      <param name="input" value="index-internal-template.html"/>
+      <param name="output" value="index.html"/>
+    </antcall>
+    <!-- flatten paths and use filename instead of file -->
+    <antcall target="create.results.html">
+      <param name="update.site.qualifier" value="${update.site.qualifier}"/>
+      <param name="PREFIX" value="/earlyaccess/builds/development/${update.site.version}.${BUILD_ALIAS}"/>
+      <param name="input" value="index-earlyaccess-template.html"/>
+      <param name="output" value="${update.site.version}.${BUILD_ALIAS}.html"/>
+    </antcall>
+  </target>
+
+  <!-- this method is the same in jbosstools-build-sites/aggregate/build.xml and in devstudio/product/site/build.xml -->
+  <target name="create.results.html">
+    <property name="input" value="results-template.html"/>
+    <property name="output" value="results.html"/>
+
+    <if>
+      <and>
+        <isset property="JOB_NAME"/>
+        <or>
+          <contains string="${JOB_NAME}" substring=".aggregate" />
+          <contains string="${JOB_NAME}" substring=".product" />
+        </or>
+        <isset property="update.site.description"/>
+        <isset property="TARGET_PLATFORM_VERSION_MAXIMUM"/>
+      </and>
+      <then>
+        <echo level="verbose">Generate index page for version = ${update.site.version}, qualifier = ${update.site.qualifier}</echo>
+
+        <condition property="BUILD_NUMBER_STRING" value="" else="${BUILD_NUMBER}">
+          <contains string="${BUILD_NUMBER}" substring="BUILD_NUMBER" />
+        </condition>
+
+        <property name="TARGET_PLATFORM_VERSION" value=""/>
+        <property name="TARGET_PLATFORM_VERSION_MAXIMUM" value=""/>
+        <propertyregex property="TARGET_PLATFORM_BRANCH" defaultvalue="${TARGET_PLATFORM_VERSION}" input="${TARGET_PLATFORM_VERSION}" regexp="([0-9]+\.[0-9]+)\..+" replace="\1.x" override="true" />
+        <propertyregex property="TARGET_PLATFORM_BRANCH_MAXIMUM" defaultvalue="${TARGET_PLATFORM_VERSION_MAXIMUM}" input="${TARGET_PLATFORM_VERSION_MAXIMUM}" regexp="([0-9]+\.[0-9]+)\..+" replace="\1.x" override="true" />
+
+        <echo level="verbose">Using target platform versions = ${TARGET_PLATFORM_VERSION}, ${TARGET_PLATFORM_VERSION_MAXIMUM}
+    From github branches = ${TARGET_PLATFORM_BRANCH}, ${TARGET_PLATFORM_BRANCH_MAXIMUM}</echo>
+
+        <!-- replace links to jobs w/ correct stream (eg., _41, _master, _70, _trunk) -->
+        <propertyregex property="STREAM_SUFFIX" defaultvalue="_master" input="${JOB_NAME}" regexp=".+(_[^_]+)" replace="\1" override="true"/>
+        <propertyregex property="STREAM_SUFFIX" defaultvalue="_master" input="${STREAM_SUFFIX}" regexp="_trunk" replace="_master" override="true"/>
+
+        <propertyregex property="STREAM_NAME" defaultvalue="Trunk" input="${inputRepo}" regexp=".+[^/]+/([^/]+)/*" replace="\1" override="true"/>
+        <propertyregex property="STREAM_NAME" defaultvalue="${STREAM_NAME}" input="${STREAM_NAME}" regexp="trunk" replace="Trunk" override="true"/>
+
+        <echo level="verbose">For JOB_NAME = ${JOB_NAME} and ${inputRepo} got stream = ${STREAM_SUFFIX} and ${STREAM_NAME}</echo>
+
+        <condition property="update.site.description_STRING" value="Nightly Build" else="${update.site.description}">
+          <contains string="${update.site.description}" substring="update.site.description" />
+        </condition>
+        <condition property="WARNING" value="This nightly build is a direct build from SVN/CVS and is provided as-is with no guarantees. Be advised that while there is no prior proof, if this build sets fire to your computer, you were sufficiently warned!" else="This build has been deemed by the JBossTools team to be in good working condition. Please note that this build may be a developer release, and if so should be treated with slightly more understanding and care than a stable release. Please see the release notes on JIRA and/or Sourceforge for further information.">
+          <contains string="${update.site.description_STRING}" substring="Nightly"/>
+        </condition>
+
+        <!-- set IDs for the chart widgets from the views -->
+        <!-- tests trend chart -->
+        <condition property="PORTLET.1" value="20174" else="27842">
+          <contains string="${JOB_NAME}" substring="_41" />
+        </condition>
+        <!-- tests pie chart -->
+        <condition property="PORTLET.2" value="25688" else="23303">
+          <contains string="${JOB_NAME}" substring="_41" />
+        </condition>
+
+        <!-- use locally built files with relative paths -->
+        <echo level="verbose">Generate ${project.build.directory}/${output} from ${input}</echo>
+        <copy todir="${project.build.directory}" overwrite="true">
+          <fileset file="${input}" />
+          <mapper type="merge" to="${output}" />
+          <filterchain>
+            <expandproperties />
+          </filterchain>
+        </copy>
+
+      </then>
+      <else>
+        <echo level="verbose">Skip generating results.html: update.site.description and TARGET_PLATFORM_VERSION_MAXIMUM are not set, and JOB_NAME does not contain .aggregate or .product.</echo>
+      </else>
+    </if>
+  </target>
+
 </project>
diff --git a/product/results/index-earlyaccess-template.html b/product/results/index-earlyaccess-template.html
index e3d0c5a..cd82cc9 100644
--- a/product/results/index-earlyaccess-template.html
+++ b/product/results/index-earlyaccess-template.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
-	<title>JBoss Developer Studio - Early Access - Build ${qualifier}</title>
+  <title>JBoss Developer Studio - Early Access - Build ${update.site.version}.${update.site.qualifier}</title>
   <link href="https://devstudio.jboss.com/web/jbds_styles.css" rel="stylesheet" type="text/css">
   <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
   <!-- Google Analytics -->
@@ -41,8 +41,8 @@
       }
     }
 
-    // given /earlyaccess/builds/stable/*/jbdevstudio-product-sources-${qualifier}.zip and builds/
-    // return stable/*/jbdevstudio-product-sources-${qualifier}.zip
+    // given /earlyaccess/builds/stable/*/jbdevstudio-product-sources-${update.site.qualifier}.zip and builds/
+    // return stable/*/jbdevstudio-product-sources-${update.site.qualifier}.zip
     function cleanURL(url,prefix)
     {
       return url.substring(url.lastIndexOf(prefix)+prefix.length);
@@ -63,7 +63,7 @@
       <table width="100%">
         <tr>
           <td align="right"><small>
-						<span style="font-size: x-small;">Build ${qualifier}</span>
+            <span style="font-size: x-small;">Build ${update.site.version}.${update.site.qualifier}</span>
           </small></td>
         </tr>
       </table>
@@ -95,7 +95,7 @@
     <h2><a name="universal"></a>
   Download
   Latest Build:&nbsp;&nbsp;<span class="build">
-	${JBDS_VERSION_STRING}.${BUILD_ALIAS_STRING}
+  ${update.site.version}.${update.site.qualifier}
   </span></h2>
 
       <ul>    
@@ -132,7 +132,6 @@
             href="${PREFIX}/${jbds-update-file-name}.MD5">MD5</a>)</span></li>
         <li class="note"><a name="sourcesnote"></a>Includes some third-party code.</li>
     </ul>
-    
 </div>
 <p style="clear:both">&nbsp;</p>
 
@@ -142,13 +141,13 @@
       Please note that documents pertaining to JBoss Tools may make mention of functionality not included or planned for inclusion in JBoss Developer Studio at this time.</p>
     <p>
     <ul>
-      <li class="jirabug"><a onClick="javascript: _gaq.push(['_trackPageview', cleanURL(this.href,'https://')]);" href="https://issues.jboss.org/secure/IssueNavigator!executeAdvanced.jspa?jqlQuery=project+in+(JBIDE,+JBDS,+TOOLSDOC)+AND+fixVersion+in+('${JBDS_VERSION_STRING}.${BUILD_ALIAS_STRING}',+'4.0.0.${BUILD_ALIAS_STRING}')+and+Status+in+(Resolved,Closed)&runQuery=true&clear=true">JBoss Tools and Developer Studio - Resolved Issues</a> </li>
+      <li class="jirabug"><a onClick="javascript: _gaq.push(['_trackPageview', cleanURL(this.href,'https://')]);" href="https://issues.jboss.org/secure/IssueNavigator!executeAdvanced.jspa?jqlQuery=project+in+(JBIDE,+JBDS,+TOOLSDOC)+AND+fixVersion+in+('${update.site.version}.${BUILD_ALIAS}',+'4.0.0.${BUILD_ALIAS}')+and+Status+in+(Resolved,Closed)&runQuery=true&clear=true">JBoss Tools and Developer Studio - Resolved Issues</a> </li>
       <!--
   <li><a href="http://community.jboss.org/en/tools/blog/2011/12/23/jboss-tools-m5-is-coming-to-town">JBoss Tools - Release Announcement</a>
   </li>
   <li><a href="http://docs.jboss.org/tools/whatsnew/">JBoss Tools - New And Noteworthy</a>
   </li>
-	<li><a href="http://sourceforge.net/projects/jboss/files/JBossTools/JBossTools4.1.0.x/zz_Release_Notes_4.1.0.${BUILD_ALIAS_STRING}.readme.html">JBoss Tools - Release Notes</a>
+  <li><a href="http://sourceforge.net/projects/jboss/files/JBossTools/JBossTools4.1.0.x/zz_Release_Notes_4.1.0.${BUILD_ALIAS}.readme.html">JBoss Tools - Release Notes</a>
   </li>
 -->
     </ul>
diff --git a/product/results/index-internal-template.html b/product/results/index-internal-template.html
index 5b6ffe4..e8222a6 100644
--- a/product/results/index-internal-template.html
+++ b/product/results/index-internal-template.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
-	<title>JBoss Developer Studio - Build ${qualifier}</title>
+  <title>JBoss Developer Studio - ${update.site.description_STRING} ${update.site.version}.${update.site.qualifier}</title>
   <link href="https://devstudio.jboss.com/web/jbds_styles.css" rel="stylesheet" type="text/css">
   <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
   </head>
@@ -11,37 +11,27 @@
   </div>
   <div id="content"> 
 
-			<table width="100%">
+      <table width="910">
         <tr>
-					<td><small>
+          <td><span style="font-size: x-small;">
             <a href="http://www.redhat.com/jbds">JBDS</a> | <a href="http://tools.hibernate.org">Hibernate Tools</a> | <a href="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">User
     Forum</a> | <a href="http://jboss.com/index.html?module=bb&op=viewforum&f=162">Developer
-		Forum</a> | <a href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10020">JIRA Issues</a> | #jbosstools on <a href="http://webchat.freenode.net/">irc.freenode.net</a></small>
+    Forum</a> | <a href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10020">JIRA Issues</a> | #jbosstools on <a href="http://webchat.freenode.net/">irc.freenode.net</a></span>
           </td>
           <td align="right">
-						<a href="http://www.redhat.com">
-							<img src="https://devstudio.jboss.com/images/redhat.gif" border="0" height="16" width="16"/>
-						</a>
-						<a href="http://www.jboss.org">
-							<img src="https://devstudio.jboss.com/images/jboss.gif" border="0" height="16" width="16"/>
-						</a>
-						<a href="http://www.hibernate.org">
-							<img src="https://devstudio.jboss.com/images/hibernate.gif" border="0" height="16" width="16"/>
-						</a>
-						<a href="http://www.eclipse.org">
-							<img src="https://devstudio.jboss.com/images/eclipse.gif" border="0" height="16" width="16"/>
-						</a>
+            <a href="http://www.redhat.com"><img src="https://devstudio.jboss.com/images/redhat.gif" border="0" height="16" width="16"/></a>
+            <a href="http://www.jboss.org"><img src="https://devstudio.jboss.com/images/jboss.gif" border="0" height="16" width="16"/></a>
+            <a href="http://www.hibernate.org"><img src="https://devstudio.jboss.com/images/hibernate.gif" border="0" height="16" width="16"/></a>
+            <a href="http://www.eclipse.org"><img src="https://devstudio.jboss.com/images/eclipse.gif" border="0" height="16" width="16"/></a>
           </td>
           <td align="right"><small>
             <a id="buildName" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER_STRING}/">
-						<span style="font-size: x-small;">Build ${qualifier}</span>
+            <span style="font-size: x-small;">Build ${update.site.qualifier}</span>
             </a>
           </td>
         </tr>
       </table>
-
-
-<h2 class="prime">JBoss Developer Studio - ${update.site.description_STRING}
+<h2 class="prime">JBoss Developer Studio - ${update.site.description_STRING} ${update.site.version}.${update.site.qualifier}
 </h2>
 <br/>
 
@@ -53,7 +43,7 @@
 <div style="background-color:#eeeecc; width:580px;padding:10px;margin:0px;padding-top:0px;margin-top:0px;border:1px #aaaaaa solid;z-index:1;position:relative;float:left">
     <h2><a name="universal"></a>
   Latest Build:&nbsp;&nbsp;<span class="build">
-	${qualifier}
+  ${update.site.version}.${update.site.qualifier}
   </span></h2>
 
       <ul>    
@@ -88,7 +78,6 @@
             href="${PREFIX}/${jbds-update-file-name}.MD5">MD5</a>)</li>
         <li class="note"><a name="sourcesnote"></a>Includes some third-party code.</li>
     </ul>
-    
 </div>
 <p style="clear:both">&nbsp;</p>
 
@@ -113,31 +102,19 @@
       <a class="blue" style="align: right;" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/${JOB_NAME}/lastBuild/console">Lastest Console</a> (!)
     </div>
 
-		<h4>SVN Revisions</h4>
-		<p>
-			<small>
-				<i>SVN Revision is for upstream <b>
-						<a class="blue" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.aggregate/">jbosstools-4.0${STREAM_SUFFIX}.aggregate</a>
-					</b>
-					<br />
-job. Results are live, 
-not specific to this build.</i>
-			</small>
-		</p>
+    <h4>Revisions</h4>
     <div align="right">
-			<a class="blue" style="align: right;" href="http://download.jboss.org/jbosstools/builds/staging/jbosstools-4.0${STREAM_SUFFIX}.aggregate/logs/">SVN Revision</a> (!)
+      <a class="blue" style="align: right;" href="../logs/ALL_REVISIONS.txt">SVN Revisions</a>
+    </div>
+    <div align="right">
+      <a class="blue" style="align: right;" href="http://download.jboss.org/jbosstools/builds/staging/jbosstools-build-sites.aggregate.site${STREAM_SUFFIX}/logs/ALL_REVISIONS.txt">Git Revisions</a>
     </div>
 
-		<h4>Target Platform: Juno SR1 (incl. Eclipse 4.2.1 + Web Tools 3.4.1)</h4>
+    <h4>Target Platforms</h4>
     <p>
       <small>
-				<i>Target Platforms are built upstream via these jobs: <br />
-&nbsp;&nbsp;&nbsp;<b>
-						<a class="blue" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.target-platform/">jbosstools-4.0${STREAM_SUFFIX}.target-platform</a>
-					</b>
-					<br />
-&nbsp;&nbsp;&nbsp;<b>
-						<a class="blue" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/devstudio-6.0${STREAM_SUFFIX}.target-platform/">devstudio-6.0${STREAM_SUFFIX}.target-platform</a>
+        <i>Target Platforms built here: <b>
+            <a class="blue" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstoolstargetplatforms-matrix/">jbosstoolstargetplatforms-matrix</a>
           </b>
           <br />
         </i>
@@ -145,65 +122,29 @@ not specific to this build.</i>
     </p>
 
     <div align="right">
-			<a class="blue" style="align: right;" href="http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0a/">JBT Target Platform Update Site</a> (!)
+      JBT Target Platforms: <a class="blue" style="align: right;" href="http://download.jboss.org/jbosstools/targetplatforms/jbosstoolstarget/${TARGET_PLATFORM_VERSION}">Min</a> &amp; <a class="blue" style="align: right;" href="http://download.jboss.org/jbosstools/targetplatforms/jbosstoolstarget/${TARGET_PLATFORM_VERSION_MAXIMUM}">Max</a>
     </div>
     <div align="right">
-			<a class="blue" style="align: right;" href="http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform_4.0.juno.SR0a/">JBDS Target Platform Update Site</a> (!)
+      JBT Target Platform Definitions: <a class="blue" style="align: right;" href="https://github.com/jbosstools/jbosstools-target-platforms/blob/${TARGET_PLATFORM_BRANCH}/jbosstools/multiple/jbosstools-multiple.target">Min</a> &amp; <a class="blue" style="align: right;" href="https://github.com/jbosstools/jbosstools-target-platforms/blob/${TARGET_PLATFORM_BRANCH_MAXIMUM}/jbosstools/multiple/jbosstools-multiple.target">Min</a>
     </div>
     <div align="right">
-			<a class="blue" style="align: right;" href="http://anonsvn.jboss.org/repos/jbosstools/trunk/build/target-platform/unified.target">JBT Target Platform Definition File</a> (!)
+      JBDS Target Platforms: <a class="blue" style="align: right;" href="http://www.qa.jboss.com/binaries/RHDS/targetplatforms/jbdevstudiotarget/${TARGET_PLATFORM_VERSION}">Min</a> &amp; <a class="blue" style="align: right;" href="http://www.qa.jboss.com/binaries/RHDS/targetplatforms/jbdevstudiotarget/${TARGET_PLATFORM_VERSION_MAXIMUM}">Max</a>
     </div>
     <div align="right">
-			<a class="blue" style="align: right;" href="http://anonsvn.jboss.org/repos/jbosstools/trunk/build/target-platform/jbds.target">JBDS Target Platform Definition File</a> (!)
+      JBDS Target Platform Definitions: <a class="blue" style="align: right;" href="https://github.com/jbosstools/jbosstools-target-platforms/blob/${TARGET_PLATFORM_BRANCH}/jbdevstudio/multiple/jbdevstudio-multiple.target">Min</a> &amp; <a class="blue" style="align: right;" href="https://github.com/jbosstools/jbosstools-target-platforms/blob/${TARGET_PLATFORM_BRANCH_MAXIMUM}/jbdevstudio/multiple/jbdevstudio-multiple.target">Min</a>
     </div>
 
     <h4>Test Results</h4>
     <p>
       <small>
-				<i>Test results at <b style="font-weight:bold;font-size:12px">right</b> are for upstream <b>
-						<a class="blue" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/">jbosstools-4.0${STREAM_SUFFIX}.tests</a>
-					</b>
-job. <br/>
-Test results <b style="font-weight:bold;font-size:12px">below</b> are cumulative across all jobs in the <a href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/view/DevStudio/view/DevStudio_${STREAM_NAME}/">DevStudio_${STREAM_NAME} view</a></i>.<br/>
+Test results <b style="font-weight:bold;font-size:12px">below</b> are cumulative across all jobs in the <a href="http://hudson.jboss.org/hudson/view/JBossTools/view/JBossTools_${STREAM_NAME}">JBossTools_${STREAM_NAME}</a> view</i>.<br/>
 Results are live, not specific to this build. 
       </small>
     </p>
 
-<p>
-		<div style="float:right">
-		<a class="blue" style="align: right" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/test/?width=800&height=600"><img src="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/test/trend?width=300&height=120" border="0"></a>&nbsp;(!)
-		<br/>
-		<a class="blue" style="align: right" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/test/?width=800&height=600&failureOnly=true"><img src="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/test/trend?width=300&height=80&failureOnly=true" border="0"></a>&nbsp;(!)
-		<br/>
-		<a class="blue" style="align: right;" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/lastCompletedBuild/testReport/">Unit test report</a> (!)
-		<br/>
-		<a class="blue" style="align: right;" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/ws/sources/*/tests/*.test/target/work/data/.metadata/.log">Unit test workspace logs</a> (!)
-		</div>
-
-	<img src="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/view/DevStudio/view/DevStudio_${STREAM_NAME}/portlet/dashboard_portlet_${PORTLET.1}/summaryGraph/png?width=600&height=440"/>
-	<br/>
-	<img src="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/view/DevStudio/view/DevStudio_${STREAM_NAME}/portlet/dashboard_portlet_${PORTLET.2}/summaryGraph/png?width=600&height=440"/>
-</p>
-
-			<h4>Test Coverage Results</h4>
-			<p>
-				<small>
-					<i>Test coverage is of upstream <b>
-							<a class="blue" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/">jbosstools-4.0${STREAM_SUFFIX}.tests</a>
-						</b>
-						<br />
-job. Results are live, 
-not specific to this build.</i>
-				</small>
+<p align="center">
+  <a href="http://hudson.jboss.org/hudson/view/JBossTools/view/JBossTools_${STREAM_NAME}/"><img border="0" src="http://hudson.jboss.org/hudson/view/JBossTools/view/JBossTools_${STREAM_NAME}/portlet/dashboard_portlet_${PORTLET.1}/summaryGraph/png?width=600&height=450"/></a>&nbsp;<a href="http://hudson.jboss.org/hudson/view/JBossTools/view/JBossTools_${STREAM_NAME}/"><img border="0" src="http://hudson.jboss.org/hudson/view/JBossTools/view/JBossTools_${STREAM_NAME}/portlet/dashboard_portlet_${PORTLET.2}/summaryGraph/png?width=300&height=450"/></a>
 </p>
-			<div align="right">
-				<a class="blue" style="align: right;" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/ws/sources/build/reports/emma-coverage/target/">Test
-coverage results</a> (!)
-			</div>
-			<div align="right">
-				<a class="blue" style="align: right;" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/ws/sources/build/reports/emma-coverage/target/emma/">Coverage.es
-session files</a> (!)
-			</div>
 
     <h4>WARNING</h4>
 
@@ -225,13 +166,13 @@ session files</a> (!)
       Please note that documents pertaining to JBoss Tools may make mention of functionality not included or planned for inclusion in JBoss Developer Studio at this time.</p>
     <p>
     <ul>
-      <li class="jirabug"><a href="https://issues.jboss.org/secure/IssueNavigator!executeAdvanced.jspa?jqlQuery=project+in+(JBIDE,+JBDS,+TOOLSDOC)+AND+fixVersion+in+('${JBDS_VERSION_STRING}.${BUILD_ALIAS_STRING}',+'4.0.0.${BUILD_ALIAS_STRING}')+and+Status+in+(Resolved,Closed)&runQuery=true&clear=true">JBoss Tools and Developer Studio - Resolved Issues</a> </li>
+      <li class="jirabug"><a href="https://issues.jboss.org/secure/IssueNavigator!executeAdvanced.jspa?jqlQuery=project+in+(JBIDE,+JBDS,+TOOLSDOC)+AND+fixVersion+in+('${update.site.version}.${BUILD_ALIAS}',+'4.0.0.${BUILD_ALIAS}')+and+Status+in+(Resolved,Closed)&runQuery=true&clear=true">JBoss Tools and Developer Studio - Resolved Issues</a> </li>
       <!--
   <li><a href="http://community.jboss.org/en/tools/blog/2011/12/23/jboss-tools-m5-is-coming-to-town">JBoss Tools - Release Announcement</a>
   </li>
   <li><a href="http://docs.jboss.org/tools/whatsnew/">JBoss Tools - New And Noteworthy</a>
   </li>
-	<li><a href="http://sourceforge.net/projects/jboss/files/JBossTools/JBossTools4.0.0.x/zz_Release_Notes_4.0.0.${BUILD_ALIAS_STRING}.readme.html">JBoss Tools - Release Notes</a>
+  <li><a href="http://sourceforge.net/projects/jboss/files/JBossTools/JBossTools4.0.0.x/zz_Release_Notes_4.0.0.${BUILD_ALIAS}.readme.html">JBoss Tools - Release Notes</a>
   </li>
 -->
     </ul>
diff --git a/product/results/index-local-template.html b/product/results/index-local-template.html
index 14e44c6..eb313ca 100644
--- a/product/results/index-local-template.html
+++ b/product/results/index-local-template.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
-	<title>JBoss Developer Studio - Build ${qualifier}</title>
+  <title>JBoss Developer Studio - ${update.site.description_STRING} ${update.site.version}.${update.site.qualifier}</title>
   <link href="https://devstudio.jboss.com/web/jbds_styles.css" rel="stylesheet" type="text/css">
   <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
   </head>
@@ -11,37 +11,27 @@
   </div>
   <div id="content"> 
 
-			<table width="100%">
+      <table width="910">
         <tr>
-					<td><small>
+          <td><span style="font-size: x-small;">
             <a href="http://www.redhat.com/jbds">JBDS</a> | <a href="http://tools.hibernate.org">Hibernate Tools</a> | <a href="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">User
     Forum</a> | <a href="http://jboss.com/index.html?module=bb&op=viewforum&f=162">Developer
-		Forum</a> | <a href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10020">JIRA Issues</a> | #jbosstools on <a href="http://webchat.freenode.net/">irc.freenode.net</a></small>
+    Forum</a> | <a href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10020">JIRA Issues</a> | #jbosstools on <a href="http://webchat.freenode.net/">irc.freenode.net</a></span>
           </td>
           <td align="right">
-						<a href="http://www.redhat.com">
-							<img src="https://devstudio.jboss.com/images/redhat.gif" border="0" height="16" width="16"/>
-						</a>
-						<a href="http://www.jboss.org">
-							<img src="https://devstudio.jboss.com/images/jboss.gif" border="0" height="16" width="16"/>
-						</a>
-						<a href="http://www.hibernate.org">
-							<img src="https://devstudio.jboss.com/images/hibernate.gif" border="0" height="16" width="16"/>
-						</a>
-						<a href="http://www.eclipse.org">
-							<img src="https://devstudio.jboss.com/images/eclipse.gif" border="0" height="16" width="16"/>
-						</a>
+            <a href="http://www.redhat.com"><img src="https://devstudio.jboss.com/images/redhat.gif" border="0" height="16" width="16"/></a>
+            <a href="http://www.jboss.org"><img src="https://devstudio.jboss.com/images/jboss.gif" border="0" height="16" width="16"/></a>
+            <a href="http://www.hibernate.org"><img src="https://devstudio.jboss.com/images/hibernate.gif" border="0" height="16" width="16"/></a>
+            <a href="http://www.eclipse.org"><img src="https://devstudio.jboss.com/images/eclipse.gif" border="0" height="16" width="16"/></a>
           </td>
           <td align="right"><small>
             <a id="buildName" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER_STRING}/">
-						<span style="font-size: x-small;">Build ${qualifier}</span>
+            <span style="font-size: x-small;">Build ${update.site.qualifier}</span>
             </a>
           </td>
         </tr>
       </table>
-
-
-<h2 class="prime">JBoss Developer Studio - ${update.site.description_STRING}
+<h2 class="prime">JBoss Developer Studio - ${update.site.description_STRING} ${update.site.version}.${update.site.qualifier}
 </h2>
 <br/>
 
@@ -53,16 +43,16 @@
 <div style="background-color:#eeeecc; width:580px;padding:10px;margin:0px;padding-top:0px;margin-top:0px;border:1px #aaaaaa solid;z-index:1;position:relative;float:left">
     <h2><a name="universal"></a>
   Latest Build:&nbsp;&nbsp;<span class="build">
-	${qualifier}
+  ${update.site.version}.${update.site.qualifier}
   </span></h2>
 
       <ul>    
         <li class="multiplatform"><a style="font-size: 18px;"
-            href="../../installer/target/${jbds-installer-universal-file-name}">Universal Multi-Platform Standalone</a><span class="multispec">&nbsp;${jbds-installer-universal-file-size}M (<a
-            href="../../installer/target/${jbds-installer-universal-file-name}.MD5">MD5</a>)</li>
+            href="${PREFIX}/${jbds-installer-universal-file-name}">Universal Multi-Platform Standalone</a><span class="multispec">&nbsp;${jbds-installer-universal-file-size}M (<a
+            href="${PREFIX}/${jbds-installer-universal-file-name}.MD5">MD5</a>)</li>
         <li class="multiplatform"><a style="font-size: 18px;"
-            href="../../installer/target/${jbds-installer-eap-universal-file-name}">Universal Multi-Platform EAP 6 Bundle</a><span class="multispec">&nbsp;${jbds-installer-eap-universal-file-size}M (<a
-            href="../../installer/target/${jbds-installer-eap-universal-file-name}.MD5">MD5</a>)</li>
+            href="${PREFIX}/${jbds-installer-eap-universal-file-name}">Universal Multi-Platform EAP 6 Bundle</a><span class="multispec">&nbsp;${jbds-installer-eap-universal-file-size}M (<a
+            href="${PREFIX}/${jbds-installer-eap-universal-file-name}.MD5">MD5</a>)</li>
         <li class="note"><a name="64bnote"></a>The Visual Page Editor does not run on 64-bit Windows or Mac. While the source editor does work, visual editing &amp; preview do not. If you require this, run the installer with a 32-bit JDK.</li>
       </ul>
 </div>
@@ -88,7 +78,6 @@
             href="${jbds-update-file-name}.MD5">MD5</a>)</li>
         <li class="note"><a name="sourcesnote"></a>Includes some third-party code.</li>
     </ul>
-    
 </div>
 <p style="clear:both">&nbsp;</p>
 
@@ -96,48 +85,16 @@
 
 <!-- BEGIN INTERNAL INFO - DO NOT COPY INTO EARLY ACCESS PAGE -->
 
-		<h4>Logs</h4>
-		<p>
-			<small>
-				<i>Logs are for <b>
-						<a class="blue" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/${JOB_NAME}/">${JOB_NAME}</a>.
-					</b>
-				</i>
-			</small>
-		</p>
-		<div align="right">
-			<a class="blue" style="align: right;" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER_STRING}/console">This Console</a>
-		</div>
-
-		<div align="right">
-			<a class="blue" style="align: right;" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/${JOB_NAME}/lastBuild/console">Lastest Console</a> (!)
-		</div>
-
-		<h4>SVN Revisions</h4>
-		<p>
-			<small>
-				<i>SVN Revision is for upstream <b>
-						<a class="blue" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.aggregate/">jbosstools-4.0${STREAM_SUFFIX}.aggregate</a>
-					</b>
-					<br />
-job. Results are live, 
-not specific to this build.</i>
-			</small>
-		</p>
+    <h4>Revisions</h4>
     <div align="right">
-			<a class="blue" style="align: right;" href="http://download.jboss.org/jbosstools/builds/staging/jbosstools-4.0${STREAM_SUFFIX}.aggregate/logs/">SVN Revision</a> (!)
+      <a class="blue" style="align: right;" href="http://download.jboss.org/jbosstools/builds/staging/jbosstools-build-sites.aggregate.site${STREAM_SUFFIX}/logs/">Git Revisions</a>
     </div>
 
-		<h4>Target Platform: Juno SR1 (incl. Eclipse 4.2.1 + Web Tools 3.4.1)</h4>
+    <h4>Target Platforms</h4>
     <p>
       <small>
-				<i>Target Platforms are built upstream via these jobs: <br />
-&nbsp;&nbsp;&nbsp;<b>
-						<a class="blue" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.target-platform/">jbosstools-4.0${STREAM_SUFFIX}.target-platform</a>
-					</b>
-					<br />
-&nbsp;&nbsp;&nbsp;<b>
-						<a class="blue" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/devstudio-6.0${STREAM_SUFFIX}.target-platform/">devstudio-6.0${STREAM_SUFFIX}.target-platform</a>
+        <i>Target Platforms built here: <b>
+            <a class="blue" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstoolstargetplatforms-matrix/">jbosstoolstargetplatforms-matrix</a>
           </b>
           <br />
         </i>
@@ -145,66 +102,30 @@ not specific to this build.</i>
     </p>
 
     <div align="right">
-			<a class="blue" style="align: right;" href="http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0a/">JBT Target Platform Update Site</a> (!)
+      JBT Target Platforms: <a class="blue" style="align: right;" href="http://download.jboss.org/jbosstools/targetplatforms/jbosstoolstarget/${TARGET_PLATFORM_VERSION}">Min</a> &amp; <a class="blue" style="align: right;" href="http://download.jboss.org/jbosstools/targetplatforms/jbosstoolstarget/${TARGET_PLATFORM_VERSION_MAXIMUM}">Max</a>
     </div>
     <div align="right">
-			<a class="blue" style="align: right;" href="http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform_4.0.juno.SR0a/">JBDS Target Platform Update Site</a> (!)
+      JBT Target Platform Definitions: <a class="blue" style="align: right;" href="https://github.com/jbosstools/jbosstools-target-platforms/blob/${TARGET_PLATFORM_BRANCH}/jbosstools/multiple/jbosstools-multiple.target">Min</a> &amp; <a class="blue" style="align: right;" href="https://github.com/jbosstools/jbosstools-target-platforms/blob/${TARGET_PLATFORM_BRANCH_MAXIMUM}/jbosstools/multiple/jbosstools-multiple.target">Min</a>
     </div>
     <div align="right">
-			<a class="blue" style="align: right;" href="http://anonsvn.jboss.org/repos/jbosstools/trunk/build/target-platform/unified.target">JBT Target Platform Definition File</a> (!)
+      JBDS Target Platforms: <a class="blue" style="align: right;" href="http://download.jboss.org/jbosstools/targetplatforms/jbosstoolstarget/${TARGET_PLATFORM_VERSION}">Min</a> &amp; <a class="blue" style="align: right;" href="http://download.jboss.org/jbosstools/targetplatforms/jbosstoolstarget/${TARGET_PLATFORM_VERSION_MAXIMUM}">Max</a>
     </div>
     <div align="right">
-			<a class="blue" style="align: right;" href="http://anonsvn.jboss.org/repos/jbosstools/trunk/build/target-platform/jbds.target">JBDS Target Platform Definition File</a> (!)
+      JBDS Target Platform Definitions: <a class="blue" style="align: right;" href="https://github.com/jbosstools/jbosstools-target-platforms/blob/${TARGET_PLATFORM_BRANCH}/jbdevstudio/multiple/jbdevstudio-multiple.target">Min</a> &amp; <a class="blue" style="align: right;" href="https://github.com/jbosstools/jbosstools-target-platforms/blob/${TARGET_PLATFORM_BRANCH_MAXIMUM}/jbdevstudio/multiple/jbdevstudio-multiple.target">Min</a>
     </div>
 
     <h4>Test Results</h4>
     <p>
       <small>
-				<i>Test results at <b style="font-weight:bold;font-size:12px">right</b> are for upstream <b>
-						<a class="blue" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/">jbosstools-4.0${STREAM_SUFFIX}.tests</a>
-					</b>
-job. <br/>
-Test results <b style="font-weight:bold;font-size:12px">below</b> are cumulative across all jobs in the <a href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/view/DevStudio/view/DevStudio_${STREAM_NAME}/">DevStudio_${STREAM_NAME} view</a></i>.<br/>
+Test results <b style="font-weight:bold;font-size:12px">below</b> are cumulative across all jobs in the <a href="http://hudson.jboss.org/hudson/view/JBossTools/view/JBossTools_${STREAM_NAME}">JBossTools_${STREAM_NAME}</a> view</i>.<br/>
 Results are live, not specific to this build. 
       </small>
     </p>
 
-<p>
-		<div style="float:right">
-		<a class="blue" style="align: right" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/test/?width=800&height=600"><img src="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/test/trend?width=300&height=120" border="0"></a>&nbsp;(!)
-		<br/>
-		<a class="blue" style="align: right" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/test/?width=800&height=600&failureOnly=true"><img src="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/test/trend?width=300&height=80&failureOnly=true" border="0"></a>&nbsp;(!)
-		<br/>
-		<a class="blue" style="align: right;" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/lastCompletedBuild/testReport/">Unit test report</a> (!)
-		<br/>
-		<a class="blue" style="align: right;" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/ws/sources/*/tests/*.test/target/work/data/.metadata/.log">Unit test workspace logs</a> (!)
-		</div>
-
-	<img src="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/view/DevStudio/view/DevStudio_${STREAM_NAME}/portlet/dashboard_portlet_${PORTLET.1}/summaryGraph/png?width=600&height=440"/>
-	<br/>
-	<img src="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/view/DevStudio/view/DevStudio_${STREAM_NAME}/portlet/dashboard_portlet_${PORTLET.2}/summaryGraph/png?width=600&height=440"/>
+<p align="center">
+  <a href="http://hudson.jboss.org/hudson/view/JBossTools/view/JBossTools_${STREAM_NAME}/"><img border="0" src="http://hudson.jboss.org/hudson/view/JBossTools/view/JBossTools_${STREAM_NAME}/portlet/dashboard_portlet_${PORTLET.1}/summaryGraph/png?width=600&height=450"/></a>&nbsp;<a href="http://hudson.jboss.org/hudson/view/JBossTools/view/JBossTools_${STREAM_NAME}/"><img border="0" src="http://hudson.jboss.org/hudson/view/JBossTools/view/JBossTools_${STREAM_NAME}/portlet/dashboard_portlet_${PORTLET.2}/summaryGraph/png?width=300&height=450"/></a>
 </p>
 
-			<h4>Test Coverage Results</h4>
-			<p>
-				<small>
-					<i>Test coverage is of upstream <b>
-							<a class="blue" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/">jbosstools-4.0${STREAM_SUFFIX}.tests</a>
-						</b>
-						<br />
-job. Results are live, 
-not specific to this build.</i>
-				</small>
-			</p>
-			<div align="right">
-				<a class="blue" style="align: right;" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/ws/sources/build/reports/emma-coverage/target/">Test
-coverage results</a> (!)
-			</div>
-			<div align="right">
-				<a class="blue" style="align: right;" href="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/job/jbosstools-4.0${STREAM_SUFFIX}.tests/ws/sources/build/reports/emma-coverage/target/emma/">Coverage.es
-session files</a> (!)
-			</div>
-
     <h4>WARNING</h4>
 
     <p>${WARNING}</p>
@@ -225,13 +146,13 @@ session files</a> (!)
       Please note that documents pertaining to JBoss Tools may make mention of functionality not included or planned for inclusion in JBoss Developer Studio at this time.</p>
     <p>
     <ul>
-      <li class="jirabug"><a href="https://issues.jboss.org/secure/IssueNavigator!executeAdvanced.jspa?jqlQuery=project+in+(JBIDE,+JBDS,+TOOLSDOC)+AND+fixVersion+in+('${JBDS_VERSION_STRING}.${BUILD_ALIAS_STRING}',+'4.0.0.${BUILD_ALIAS_STRING}')+and+Status+in+(Resolved,Closed)&runQuery=true&clear=true">JBoss Tools and Developer Studio - Resolved Issues</a> </li>
+      <li class="jirabug"><a href="https://issues.jboss.org/secure/IssueNavigator!executeAdvanced.jspa?jqlQuery=project+in+(JBIDE,+JBDS,+TOOLSDOC)+AND+fixVersion+in+('${update.site.version}.${BUILD_ALIAS}',+'4.0.0.${BUILD_ALIAS}')+and+Status+in+(Resolved,Closed)&runQuery=true&clear=true">JBoss Tools and Developer Studio - Resolved Issues</a> </li>
       <!--
   <li><a href="http://community.jboss.org/en/tools/blog/2011/12/23/jboss-tools-m5-is-coming-to-town">JBoss Tools - Release Announcement</a>
   </li>
   <li><a href="http://docs.jboss.org/tools/whatsnew/">JBoss Tools - New And Noteworthy</a>
   </li>
-	<li><a href="http://sourceforge.net/projects/jboss/files/JBossTools/JBossTools4.0.0.x/zz_Release_Notes_4.0.0.${BUILD_ALIAS_STRING}.readme.html">JBoss Tools - Release Notes</a>
+  <li><a href="http://sourceforge.net/projects/jboss/files/JBossTools/JBossTools4.0.0.x/zz_Release_Notes_4.0.0.${BUILD_ALIAS}.readme.html">JBoss Tools - Release Notes</a>
   </li>
 -->
     </ul>
diff --git a/product/results/pom.xml b/product/results/pom.xml
index 0119f65..6f98914 100644
--- a/product/results/pom.xml
+++ b/product/results/pom.xml
@@ -15,17 +15,9 @@
   </description>
   <packaging>pom</packaging>
 
-	<!--
-	To build locally while generating installers/sources, must set a number of variables:
-		mvn install -DJOB_NAME=devstudio-6.0_stable_branch.updatesite
-	To build locally against previously built installers/sources, must set more variables:
-		mvn install -DJOB_NAME=devstudio-6.0_stable_branch.updatesite -DTIMESTAMP=20120608-1840 -Dupdate.site.description="Development Milestone"
-	-->
-
   <properties>
-		<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
+    <maven.build.timestamp.format>'${BUILD_ALIAS}-v'yyyyMMdd-HHmm</maven.build.timestamp.format>
   </properties>
-
   <build>
     <plugins>
       <plugin>
@@ -39,13 +31,12 @@
               <quiet>true</quiet>
               <tasks>
                 <ant antfile="build.xml" target="build" dir="./">
+                  <property name="project.version" value="${project.version}" />
+                  <property name="update.site.qualifier" value="${maven.build.timestamp}"/>
                   <property name="update.site.description" value="${update.site.description}"/>
-									<property name="JOB_NAME" value="${JOB_NAME}" />
-									<property name="JBDS_VERSION" value="${JBDS_VERSION}"/>
-									<property name="TIMESTAMP" value="${TIMESTAMP}"/>
-									<property name="maven.build.timestamp" value="${maven.build.timestamp}"/>
-									<property name="BUILD_NUMBER" value="${BUILD_NUMBER}"/>	
                   <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/>
+                  <property name="TARGET_PLATFORM_VERSION" value="${TARGET_PLATFORM_VERSION}"/>
+                  <property name="TARGET_PLATFORM_VERSION_MAXIMUM" value="${TARGET_PLATFORM_VERSION_MAXIMUM}"/>
                 </ant>
               </tasks>
             </configuration>
@@ -96,3 +87,7 @@
   </build>
 
 </project>
+<!--
+To build locally
+  mvn clean install -Dupdate.site.description="Development Milestone" -DBUILD_NUMBER=69 -DJOB_NAME=devstudio.product_trunk
+-->
diff --git a/product/site/build.xml b/product/site/build.xml
index 96c3f4c..e6a3551 100644
--- a/product/site/build.xml
+++ b/product/site/build.xml
@@ -1,7 +1,7 @@
 <project default="custom.build" name="devstudio extras site build.xml">
   <!--
   To test output, run maven in this folder:
-		$ mvn install -DJOB_NAME=devstudio-6.0_trunk.updatesite -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DBUILD_ALIAS=M7 -Dupdate.site.description="Stable Milestone"
+    $ mvn install -Dupdate.site.description="Stable Milestone"
   -->
 
   <!-- if ${WORKSPACE}/site folder exists, target that folder; else generate here. -->
@@ -167,43 +167,7 @@ To run this build, use Tycho. Try `mvn3 clean install -U -B -fae -q -e`
   </target>
 
   <target name="add.web.content">
-		<!-- 
-		Calculated here
-			from ${JOB_NAME} = devstudio-3.2.0.M1.updatesite get 3.2.0.M1  
-			from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-B${BUILD_NUMBER}
-			default update.site.description=Nightly Build
-			default update.site.version=(null)
-		-->
-		<property name="update.site.description" value="Nightly Build" />
-		<if>
-			<and>
-				<not>
-					<isset property="update.site.version" />
-				</not>
-				<isset property="JOB_NAME" />
-				<isset property="BUILD_ID" />
-				<isset property="BUILD_NUMBER" />
-			</and>
-			<then>
-				<!-- from 2011-09-21_01-11-04 to 20110921-0111 -->
-				<propertyregex override="true" property="BUILD_TS" defaultvalue="${BUILD_ID}" input="${BUILD_ID}" regexp="([0-9]+)-([0-9]+)-([0-9]+)_([0-9]+)-([0-9]+)-([0-9]+)" replace="v\1\2\3-\4\5" />
-				<if>
-					<and>
-						<isset property="JBDS_VERSION" />
-						<isset property="BUILD_ALIAS" />
-					</and>
-					<then>
-						<propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="devstudio-([0-9.]+)(_stable_branch|_trunk)(.*).updatesite" replace="${JBDS_VERSION}.${BUILD_ALIAS}-${BUILD_TS}-B${BUILD_NUMBER}.core" />
-					</then>
-					<else>
-						<propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="devstudio-([0-9.]+)(_stable_branch|_trunk)(.*).updatesite" replace="\1.${BUILD_TS}-B${BUILD_NUMBER}.core" />
-					</else>
-				</if>
-			</then>
-			<else>
-				<property name="update.site.version" value="" />
-			</else>
-		</if>
+    <propertyregex property="update.site.version" defaultvalue="${project.version}" input="${project.version}" regexp="-SNAPSHOT" replace=".${update.site.qualifier}" override="true" />
 
     <!-- get category.xml as HTML, then load into ${site.contents} in order to merge into index.html -->
     <antcallback target="generate.site.content.html" return="site.contents" />
@@ -328,4 +292,5 @@ To run this build, use Tycho. Try `mvn3 clean install -U -B -fae -q -e`
     <property name="site.contents" value="" />
     <delete quiet="true" file="${update.site.source.dir}/site.contents.html" />
   </target>
+
 </project>
diff --git a/product/site/pom.xml b/product/site/pom.xml
index cda4edc..2d4c19c 100644
--- a/product/site/pom.xml
+++ b/product/site/pom.xml
@@ -33,20 +33,6 @@
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-director-plugin</artifactId>
 				<version>${tychoVersion}</version>
-				<!-- executions>
-					<execution>
-						<id>materialize-products</id>
-						<goals>
-							<goal>materialize-products</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>archive-products</id>
-						<goals>
-							<goal>archive-products</goal>
-						</goals>
-					</execution>
-				</executions-->
 				<configuration>
 					<products>
 						<product>
@@ -68,8 +54,13 @@
 							<tasks>
 								<!-- called AFTER generating update site + zip to tweak content -->
 								<ant antfile="build.xml">
-									<property name="JBDS_VERSION" value="${JBDS_VERSION}" />
+                  <property name="project.version" value="${project.version}" />
+                  <property name="update.site.qualifier" value="${buildQualifier}"/>
                   <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/>
+                  <!-- these are needed for generating results.xml -->
+                  <property name="update.site.description" value="${update.site.description}"/>
+                  <property name="TARGET_PLATFORM_VERSION" value="${TARGET_PLATFORM_VERSION}"/>
+                  <property name="TARGET_PLATFORM_VERSION_MAXIMUM" value="${TARGET_PLATFORM_VERSION_MAXIMUM}"/>
 								</ant>
 							</tasks>
 						</configuration>
diff --git a/product/sources/build.xml b/product/sources/build.xml
index c3e436e..0327245 100644
--- a/product/sources/build.xml
+++ b/product/sources/build.xml
@@ -52,22 +52,26 @@ $java.home = ${java.home}</echo>
   </target>
 
   <target name="build" depends="init">
-		<!-- pass in the following 4 variables from Maven -->
-		<property name="JBDS_VERSION_STRING" value="" />
-		<tstamp>
-			<format property="TIMESTAMP" pattern="yyyyMMdd-HHmm" locale="en,US" timezone="GMT"/>
-		</tstamp>
-		<property name="BUILD_NUMBER_STRING" value="" />
-		<property name="BUILD_ALIAS_STRING" value="" />
-
-		<var name="qualifier" value="${JBDS_VERSION_STRING}${BUILD_ALIAS_STRING}v${TIMESTAMP}${BUILD_NUMBER_STRING}" />
+    <!-- get timestamp from upstream installer build (units.unit.id = Alpha2-v20130326-1416-B6969.jbds) instead of maven since tycho and pure maven don't use the same value -->
     <if>
-			<contains string="${BUILD_NUMBER_STRING}" substring="BUILD_NUMBER"/>
+      <available file="../installer/target/p2content.xml"/>
       <then>
-				<var name="qualifier" value="${JBDS_VERSION_STRING}${BUILD_ALIAS_STRING}v${TIMESTAMP}" />
+        <xmlproperty file="../installer/target/p2content.xml" collapseAttributes="true"/>
+        <propertyregex property="update.site.qualifier" defaultvalue="${units.unit.id}" input="${units.unit.id}" regexp=".jbds" replace="" override="true" />
+      </then>
+      <else>
+        <if>
+          <isset property="BUILD_NUMBER"/>
+          <then>
+            <var name="update.site.qualifier" value="${update.site.qualifier}-B${BUILD_NUMBER}"/>
           </then>
         </if>
-		<property name="sourcesZip" value="target/jbdevstudio-product-sources-${qualifier}.zip" />
+      </else>
+    </if>
+
+    <propertyregex property="update.site.version" defaultvalue="${project.version}" input="${project.version}" regexp="-SNAPSHOT" replace="" override="true" />
+    
+    <property name="sourcesZip" value="target/jbdevstudio-product-sources-${update.site.version}.${update.site.qualifier}.zip" />
 
     <antcall target="get.local.sources" />
     <antcallback target="get.zips" return="ALL_ZIPS" />
@@ -95,7 +99,7 @@ $java.home = ${java.home}</echo>
   <target name="get.zips">
 
     <!-- given http://download.jboss.org/jbosstools/updates/nightly/core/4.1.kepler/, want http://download.jboss.org/jbosstools/builds/nightly/core/4.1.kepler/ -->
-		<propertyregex property="inputBuild" input="${jbosstools-nightly}" regexp="updates/nightly" replace="builds/nightly" />
+    <propertyregex property="inputBuild" input="${inputRepo}" regexp="updates/nightly" replace="builds/nightly" />
 
     <antcallback target="get.list" return="ALL_ZIPS" />
     <for list="${ALL_ZIPS}" param="zip" delimiter=", 
diff --git a/product/sources/pom.xml b/product/sources/pom.xml
index ed285a3..9585d1d 100644
--- a/product/sources/pom.xml
+++ b/product/sources/pom.xml
@@ -16,9 +16,8 @@
   <packaging>pom</packaging>
 
   <properties>
-		<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
+    <maven.build.timestamp.format>'${BUILD_ALIAS}-v'yyyyMMdd-HHmm</maven.build.timestamp.format>
   </properties>
-
   <build>
     <plugins>
       <plugin>
@@ -35,11 +34,9 @@
                   <!-- pass in URL of current published jbosstools-nightly URL, eg.,
                      http://download.jboss.org/jbosstools/updates/nightly/core/trunk/ or 
                      http://download.jboss.org/jbosstools/updates/nightly/core/4.1.kepler/ -->
-									<property name="jbosstools-nightly" value="${jbosstools-nightly}"/>
-									<property name="JBDS_VERSION_STRING" value="${JBDS_VERSION}."/>
-									<property name="TIMESTAMP" value="${maven.build.timestamp}"/>
-									<property name="BUILD_NUMBER_STRING" value="-B${BUILD_NUMBER}"/>	
-									<property name="BUILD_ALIAS_STRING" value="${BUILD_ALIAS}-"/>
+                  <property name="inputRepo" value="${jbosstools-nightly}"/>
+                  <property name="project.version" value="${project.version}" />
+                  <property name="update.site.qualifier" value="${maven.build.timestamp}"/>
                 </ant>
               </tasks>
             </configuration>
@@ -90,3 +87,7 @@
   </build>
 
 </project>
+<!--
+To build locally
+  mvn clean install -DBUILD_NUMBER=69
+-->