diff --git a/openjpa-project/assembly.xml b/openjpa-project/assembly.xml
index ade991ee1..7537aa2cb 100644
--- a/openjpa-project/assembly.xml
+++ b/openjpa-project/assembly.xml
@@ -59,8 +59,8 @@
         </fileSet>
         -->
         <fileSet>
-            <directory>target/manual</directory>
-            <outputDirectory>docs/manual</outputDirectory>
+            <directory>target/docbook</directory>
+            <outputDirectory>docs/docbook</outputDirectory>
         </fileSet>
         <fileSet>
             <directory>../target/site/apidocs</directory>
diff --git a/openjpa-project/upload.xml b/openjpa-project/upload.xml
index 457a2874c..2f03ca948 100644
--- a/openjpa-project/upload.xml
+++ b/openjpa-project/upload.xml
@@ -33,21 +33,14 @@
             </fileset>
             <patternset>
                 <include name="**/javadoc/**" />
-                <include name="**/manual/**" />
+                <include name="**/docbook/**" />
             </patternset>
         </unzip>
     	
-    	<!-- copy schema files -->
-    	<mkdir dir="target/site/tempDocs/apache-openjpa-${project.version}/schema"/>
-    	<copy file="../openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd"
-    		todir="target/site/tempDocs/apache-openjpa-${project.version}/schema"/>
-    	<copy file="../openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd"
-    		todir="target/site/tempDocs/apache-openjpa-${project.version}/schema"/>   	
-    	
         <zip destfile="target/site/tempDocs/docs.zip">
             <fileset dir="target/site/tempDocs">
                 <include name="**/javadoc/**"/>
-                <include name="**/manual/**"/>
+                <include name="**/docbook/**"/>
                 <exclude name="docs/**"/>
             </fileset>
         </zip>