diff --git a/build.xml b/build.xml
index 6eee7dcd2..e66ff1eac 100644
--- a/build.xml
+++ b/build.xml
@@ -19,7 +19,9 @@
 
     <target name="build-engine" description="Builds the engine libraries only">
         <ant dir="engine" target="clean"/>
-        <ant dir="engine" target="dist"/>
+        <ant dir="engine" target="jar"/>
+        <ant dir="engine" target="javadoc"/>
+        <ant dir="engine" target="create-zip-distribution"/>
     </target>
 
     <target name="clean" description="Clean all build products" depends="-check-platform, -update-sdk-platform-config">
@@ -72,46 +74,22 @@
        ****************************************************************
       -->
       
-    <target name="hudson-nightly" depends="-check-platform, -update-sdk-platform-config">
-        <exec executable="svn" dir="engine">
-            <arg value="cleanup" />
-        </exec>
-        <exec executable="svn" dir="engine">
-            <arg value="revert" />
-        </exec>
-        <exec executable="svn" dir="engine">
-            <arg value="cleanup" />
-        </exec>
-        <exec executable="svn" dir="engine">
-            <arg value="update" />
-        </exec>
-        <ant dir="engine" target="dist"/>
-        <ant dir="engine" target="build-bullet-natives"/>
-        <ant dir="engine" target="update-sdk"/>
+    <target name="hudson-nightly" depends="-check-platform, -update-sdk-platform-config, -hudson-build-engine">
         <ant dir="engine" target="copy-javadoc"/>
+        <ant dir="engine" target="create-zip-distribution"/>
         <ant dir="sdk" target="hudson-nightly"/>
     </target>
 
-    <target name="hudson-stable" depends="-check-platform, -update-sdk-platform-config">
-        <exec executable="svn" dir="engine">
-            <arg value="cleanup" />
-        </exec>
-        <exec executable="svn" dir="engine">
-            <arg value="revert" />
-        </exec>
-        <exec executable="svn" dir="engine">
-            <arg value="cleanup" />
-        </exec>
-        <exec executable="svn" dir="engine">
-            <arg value="update" />
-        </exec>
-        <ant dir="engine" target="dist"/>
-        <ant dir="engine" target="build-bullet-natives"/>
-        <ant dir="engine" target="update-sdk"/>
+    <target name="hudson-stable" depends="-check-platform, -update-sdk-platform-config, -hudson-build-engine">
+        <!--ant dir="engine" target="dist"/-->
         <ant dir="sdk" target="hudson-stable"/>
     </target>
 
-    <target name="hudson-release" depends="-check-platform, -update-sdk-platform-config">
+    <target name="hudson-release" depends="-check-platform, -update-sdk-platform-config, -hudson-build-engine">
+        <ant dir="sdk" target="hudson-release"/>
+    </target>
+    
+    <target name="-hudson-build-engine">
         <exec executable="svn" dir="engine">
             <arg value="cleanup" />
         </exec>
@@ -124,10 +102,13 @@
         <exec executable="svn" dir="engine">
             <arg value="update" />
         </exec>
-        <ant dir="engine" target="dist"/>
+        <exec executable="svn" dir=".">
+            <arg value="unlock" />
+            <arg value="engine" />
+        </exec>
         <ant dir="engine" target="build-bullet-natives"/>
-        <ant dir="engine" target="update-sdk"/>
-        <ant dir="sdk" target="hudson-release"/>
+        <ant dir="engine" target="javadoc"/>
+        <ant dir="engine" target="update-sdk-nobuild"/>
     </target>
 
 </project>
\ No newline at end of file
diff --git a/engine/build.xml b/engine/build.xml
index 146517229..ff1801fad 100644
--- a/engine/build.xml
+++ b/engine/build.xml
@@ -300,7 +300,7 @@
       -->
 
     <!-- puts jme3 jars, libs, source and javadoc in a dated zip file -->
-    <target name="dist" depends="clean, jar, javadoc" description="puts jme3 jars, libs, source and javadoc in a dated zip file">
+    <target name="create-zip-distribution" description="puts jme3 jars, libs, source and javadoc in a dated zip file">
         <!-- create date in the format MM-dd-yyyy -->
         <tstamp>
             <format property="date" pattern="yyyy-MM-dd" locale="en,US"/>
@@ -340,26 +340,10 @@
         </zip>
     </target>
 
-    <!-- copy jme3 zip to jmonkeyengine.com/nightly -->
-    <target name="deploy-hudson-nightly" depends="dist, build-bullet-natives">
-        <copy
-            file="${jme3zip}"
-            toDir="/var/www/com/stable" overwrite="true" failonerror="true" verbose="false"
-            />
-        <copydir
-            src="dist/javadoc/" dest="/var/www/org/javadoc/" forceoverwrite="true"
-            />
-    </target>
-
-    <!-- copy jme3 zip to jmonkeyengine.com/nightly -->
-    <target name="deploy-hudson-stable" depends="dist, build-bullet-natives">
-        <copy
-            file="${jme3zip}"
-            toDir="/var/www/com/stable" overwrite="true" failonerror="true" verbose="false"
-            />
-        <copydir
-            src="dist/javadoc/" dest="/var/www/org/javadoc/" forceoverwrite="true"
-            />
+    <target name="update-sdk-nobuild">
+        <antcall target="-do-update-sdk" inheritall="true">
+            <param name="jmp_dir" value="../sdk/"/>
+        </antcall>
     </target>
     
     <target name="copy-javadoc">