diff --git a/build.xml b/build.xml
index 35d073e7c3..f14393f080 100644
--- a/build.xml
+++ b/build.xml
@@ -69,7 +69,7 @@
     <!-- This target will create a custom ZIP file for us.  It first uses the general
       ZIP target and then opens it up and adds in any files that we want.  This is where we customize the
       version number. -->
-    <target name="build-zip" depends="suite.build-zip">
+    <target name="build-zip" depends="suite.build-zip,findJRE">
         <property name="nbdist.dir" value="dist"/>
         <property name="release.dir" value="${nbdist.dir}/${app.name}"/>
 
@@ -84,11 +84,17 @@
         <copy file="${basedir}/LICENSE-2.0.txt" tofile="${zip-tmp}/${app.name}/LICENSE-2.0.txt"/>
         <copy file="${basedir}/NEWS.txt" tofile="${zip-tmp}/${app.name}/NEWS.txt"/>
         <copy file="${basedir}/KNOWN_ISSUES.txt" tofile="${zip-tmp}/${app.name}/KNOWN_ISSUES.txt"/>
+        <unzip src="${thirdparty.dir}/gstreamer/${os.family}/i386/0.10.7/gstreamer.zip" dest="${zip-tmp}/${app.name}/gstreamer"/>
+        <copy todir="${zip-tmp}/${app.name}/jre6">
+            <fileset dir="${env.JRE_HOME}"/>
+        </copy>
+        <copy file="${basedir}/branding_${app.name}/icon.ico" tofile="${zip-tmp}/${app.name}/icon.ico" overwrite="true"/>
         <antcall target="copyExternalLibsToZip"></antcall>
         
         <propertyfile
         file="${zip-tmp}/${app.name}/etc/${app.name}.conf">
             <entry key="default_options" value="&quot;--branding ${app.name} -J-Xms24m -J-Xmx1024m&quot;" />
+            <entry key="jdkhome" value="&quot;jre6&quot;" />
         </propertyfile>
         
         <!-- step (4) zip again, but with the version numbers in the dir -->
@@ -199,22 +205,8 @@
     </target>
      
     
-    <target name="build-installer-dir" depends="findJRE,build-zip" >
+    <target name="build-installer-dir" depends="build-zip" >
         <unzip src="${nbdist.dir}/${app.name}-${app.version}.zip" dest="${nbdist.dir}/${app.name}-installer"/>
-        <antcall target="update-jdkhome" />
-        <delete file="${nbdist.dir}/${app.name}-${app.version}.zip"/>
-        <unzip src="${thirdparty.dir}/gstreamer/${os.family}/i386/0.10.7/gstreamer.zip" dest="${nbdist.dir}/${app.name}-installer/gstreamer"/>
-        <copy todir="${nbdist.dir}/${app.name}-installer/jre6">
-            <fileset dir="${env.JRE_HOME}"/>
-        </copy>
-        <copy file="${basedir}/branding_${app.name}/icon.ico" tofile="${nbdist.dir}/${app.name}-installer/icon.ico" overwrite="true"/>
-    </target>
-    
-    <target name="update-jdkhome" depends="getProps">
-        <propertyfile
-        file="${nbdist.dir}/${app.name}-installer/etc/${app.name}.conf">
-            <entry key="jdkhome" value="&quot;jre6&quot;" />
-        </propertyfile>
     </target>
     
     <target name="build-installer" depends="build-installer-dir">