diff --git a/releng/org.eclipse.cdt.releng/build.sh b/releng/org.eclipse.cdt.releng/build.sh
index 45518a41309..b1120d40838 100644
--- a/releng/org.eclipse.cdt.releng/build.sh
+++ b/releng/org.eclipse.cdt.releng/build.sh
@@ -1,2 +1 @@
-export JAVA_HOME=/usr/java/j2sdk1.4.2
-java -classpath $JAVA_HOME/lib/tools.jar:jars/ant.jar:jars/optional.jar:jars/xalan.jar:jars/xml-apis.jar:jars/xercesImpl.jar:jars/NetComponents.jar org.apache.tools.ant.Main $* 2>&1 | tee build.log
+java -classpath $JAVA_HOME/lib/tools.jar:jars/ant.jar:jars/optional.jar:jars/xalan.jar:jars/xml-apis.jar:jars/xercesImpl.jar:jars/NetComponents.jar:jars/activation.jar:jars/mail.jar org.apache.tools.ant.Main $* 2>&1 | tee build.log
diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 90cd76ffeb3..e9c1bae028a 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -23,4 +23,8 @@
         <ant antfile="main.xml" target="upload"/>
     </target>
 
+    <target name="mail" depends="bootstrap">
+        <ant antfile="main.xml" target="mail"/>
+    </target>
+
 </project>
diff --git a/releng/org.eclipse.cdt.releng/main.xsl b/releng/org.eclipse.cdt.releng/main.xsl
index 3baea8e9aea..512d04a8c17 100644
--- a/releng/org.eclipse.cdt.releng/main.xsl
+++ b/releng/org.eclipse.cdt.releng/main.xsl
@@ -98,6 +98,7 @@
 
 		<!-- Run the build.xml scripts -->
 	        <xsl:for-each select="projects/feature">
+		    <!-- The default to build the update jars -->
 		    <ant>
 		        <xsl:attribute name="dir">
 			    <xsl:text>build/features/</xsl:text>
@@ -107,9 +108,19 @@
 			<property name="ws" value="gtk"/>
 			<property name="os" value="linux"/>
 		    </ant>
+		    <!-- The old style zips -->
+		    <ant target="zip.distribution">
+		        <xsl:attribute name="dir">
+			    <xsl:text>build/features/</xsl:text>
+			    <xsl:value-of select="@name"/>
+			</xsl:attribute>
+			<property name="javacFailOnError" value="true"/>
+			<property name="ws" value="gtk"/>
+			<property name="os" value="linux"/>
+		    </ant>
 		</xsl:for-each>
 
-		<!-- Move jars to the update site format -->
+		<!-- Move jars and zips to the update site format -->
 		<delete dir="plugins"/>
 		<copy todir="plugins" flatten="true">
 		    <fileset dir="build/plugins">
@@ -140,6 +151,21 @@
 			</xsl:for-each>
 		    </fileset>
 		</copy>
+		<delete dir="dist"/>
+		<copy todir="dist" flatten="true">
+		    <fileset dir="build/features">
+		        <xsl:for-each select="projects/feature">
+			    <include>
+			        <xsl:attribute name="name">
+				    <xsl:value-of select="@name"/>
+				    <xsl:text>/</xsl:text>
+				    <xsl:value-of select="@name"/>
+				    <xsl:text>_${build.version}.${build.number}.bin.dist.zip</xsl:text>
+				</xsl:attribute>
+			    </include>
+			</xsl:for-each>
+		    </fileset>
+		</copy>
 
 	        <!-- Set up the test environment -->
 	        <delete dir="test"/>
@@ -208,6 +234,7 @@
 		    <fileset dir=".">
 		        <include name="plugins/*.jar"/>
 			<include name="features/*.jar"/>
+			<include name="dist/*.zip"/>
 		        <include name="logs/**/*.html"/>
 			<include name="build.number"/>
 			<include name="index.html"/>
@@ -216,7 +243,14 @@
 		</ftp>
 	    </target>
 
-	    <target name="all" depends="build,upload"/>
+	    <target name="mail">
+	        <mail from="dschaefe@ca.ibm.com"
+		    tolist="cdt-test-dev@eclipse.org"
+		    subject="CDT Build ${{build.version}}.${{build.number}} completed"
+		    message="This has been an automated message"/>
+	    </target>
+
+	    <target name="all" depends="build,upload,mail"/>
 	</project>
     </xsl:template>