diff --git a/assembly/pom.xml b/assembly/pom.xml
index 0675d0aac..f4d7d7f8d 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -288,12 +288,10 @@
                                     <arg value="-nv" />
                                     <arg value="-E" />
                                     <arg value="-L" />
+                                    <arg value="--directory-prefix=${project.build.directory}/cwiki" />
                                     <arg value="-r" />
                                     <arg value="http://cwiki.apache.org/WW/" />
                                 </exec>
-                                <move todir="${project.build.directory}/cwiki">
-                                    <fileset dir="WW/docs" />
-                                </move>
                             </tasks>
                         </configuration>
                         <goals>
diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml
index 5e158ff60..12f6182a6 100644
--- a/assembly/src/main/assembly/docs.xml
+++ b/assembly/src/main/assembly/docs.xml
@@ -50,7 +50,7 @@
 
       <!-- Include the Confluence docs in the assembly -->
       <fileSet>
-        <directory>target/cwiki</directory>
+        <directory>target/cwiki/WW</directory>
         <outputDirectory>docs</outputDirectory>
       </fileSet>