diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml
index abb498cd7..8d5505dac 100644
--- a/openjpa-project/pom.xml
+++ b/openjpa-project/pom.xml
@@ -391,10 +391,10 @@
                                 <phase>package</phase>
                                 <configuration>
                                     <tasks>
-                                        <ant antfile="upload.xml" target="upload" unheritRefs="true">
-                                            <property name="${nightly.user.name}" value="${nightly.user.name}"/>
-                                            <property name="${nightly.password}" value="${nightly.password}"/>
-                                            <property name="${nightly.version}" value="${nightly.version}"/>
+                                        <ant antfile="upload.xml" target="upload" inheritRefs="true">
+                                            <property name="nightly.user.name" value="${nightly.user.name}"/>
+                                            <property name="nightly.password" value="${nightly.password}"/>
+                                            <property name="nightly.version" value="${nightly.version}"/>
                                         </ant>
                                     </tasks>
                                 </configuration>
diff --git a/openjpa-project/upload.xml b/openjpa-project/upload.xml
index 05686a153..209336b60 100644
--- a/openjpa-project/upload.xml
+++ b/openjpa-project/upload.xml
@@ -1,8 +1,12 @@
-<project name="upload" default="dist" basedir=".">
+<project name="upload" default="upload" basedir=".">
     <description>
         Ant build file used to upload binaries to openjpa.apache.org/builds/latest. 
     </description>
     <target name="upload">
+
+        <property name="build.dir" value="/www/openjpa.apache.org/builds"/>
+        <property name="host" value="people.apache.org"/>
+
         <mkdir dir="target/site/tempDocs" />
         <unzip dest="target/site/tempDocs">
             <fileset dir="target/site/downloads">
@@ -13,21 +17,34 @@
                 <include name="**/manual/**" />
             </patternset>
         </unzip>
-        <move todir="target/site/tempDocs/docs">
-            <fileset dir="target/site/tempDocs/apache-openjpa-${pom.version}/docs" /> 
-        </move>
+        <zip destfile="target/site/tempDocs/docs.zip">
+            <fileset dir="target/site/tempDocs">
+                <include name="**/javadoc/**"/>
+                <include name="**/manual/**"/>
+                <exclude name="docs/**"/>
+            </fileset>
+        </zip>
         <checksum> 
             <fileset dir="target/site/downloads/">
                 <include name="*.zip" />
             </fileset>
         </checksum>
-        <scp todir="${nightly.user.name}:${nightly.password}@people.apache.org:/www/openjpa.apache.org/builds/${nightly.version}/downloads" trust="true">
+        
+        <scp todir="${nightly.user.name}:${nightly.password}@${host}:${build.dir}" trust="true">
+            <fileset dir="target/site/tempDocs"> 
+                <include name="docs.zip"/>
+            </fileset>
+        </scp>
+        <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="unzip -qq -d ${build.dir}/ ${build.dir}/docs.zip" trust="true" />
+        <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm ${build.dir}/docs.zip" trust="true" />
+        <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="mkdir ${build.dir}/apache-openjpa-${pom.version}/downloads " trust="true" />
+        
+        <scp todir="${nightly.user.name}:${nightly.password}@${host}:${build.dir}/apache-openjpa-${pom.version}/downloads" trust="true">
             <fileset dir="target/site/downloads" />
         </scp>
-        <scp todir="${nightly.user.name}:${nightly.password}@people.apache.org:/www/openjpa.apache.org/builds/${nightly.version}/docs" trust="true">
-            <fileset dir="target/site/tempDocs/docs" /> 
-        </scp>
-        <sshexec host="people.apache.org" username="${nightly.user.name}" password="${nightly.password}" command="chmod -R g+w /www/openjpa.apache.org/builds/${nightly.version}" trust="true" />
+        
+        <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="chmod -R g+w ${build.dir}/apache-openjpa-${pom.version}" trust="true" />
+        
         <delete>
             <fileset dir="target/site/tempDocs" />
         </delete>