diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index 541142e29..12206f113 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -50,9 +50,27 @@
     <!-- Include the XWork Javadoc in the assembly -->
     <fileSet>
       <directory>target/xwork-apidocs</directory>
-      <outputDirectory>xwork-apidocs</outputDirectory>
+      <outputDirectory>docs/xwork-apidocs</outputDirectory>
     </fileSet>
 
+      <!-- Include the website in the assembly -->
+      <fileSet>
+        <directory>../target/site</directory>
+        <outputDirectory>docs</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../api/target/site</directory>
+        <outputDirectory>docs/struts2-api</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../core/target/site</directory>
+        <outputDirectory>docs/struts2-core</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../extras/target/site</directory>
+        <outputDirectory>docs/struts2-extras</outputDirectory>
+      </fileSet>
+
     <!-- Include the source code in the assembly -->
     <fileSet>
       <directory>../</directory>