diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index 02d639b25d..acf9c98ff1 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -101,19 +101,19 @@
 
     <!-- Include the XWork Javadoc in the assembly -->
     <fileSet>
-      <directory>../xwork-core/target/site/apidocs</directory>
+      <directory>../xwork-core/target/apidocs</directory>
       <outputDirectory>docs/xwork-apidocs</outputDirectory>
     </fileSet>
 
-      <!-- Include the website in the assembly -->
-      <fileSet>
-        <directory>../target/site</directory>
-        <outputDirectory>docs</outputDirectory>
-      </fileSet>
+      <!-- Include the Struts 2 core Javadoc in the assembly -->
       <fileSet>
         <directory>../core/target/site</directory>
         <outputDirectory>docs/struts2-core</outputDirectory>
       </fileSet>
+      <fileSet>
+        <directory>../core/target/apidocs</directory>
+        <outputDirectory>docs/struts2-core-apidocs</outputDirectory>
+      </fileSet>
 
       <!-- Include the Confluence docs in the assembly -->
       <fileSet>
diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml
index 721c0bab06..d5d2f7bfa5 100644
--- a/assembly/src/main/assembly/docs.xml
+++ b/assembly/src/main/assembly/docs.xml
@@ -47,7 +47,7 @@
 
         <!-- Include the Confluence docs in the assembly -->
         <fileSet>
-            <directory>target/cwiki/WW/docs</directory>
+            <directory>target/cwiki</directory>
             <outputDirectory>docs/docs</outputDirectory>
         </fileSet>