diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7dda03d63..955ba734e 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -103,6 +103,7 @@
                                     <groupId>opensymphony</groupId>
                                     <artifactId>xwork</artifactId>
                                     <classifier>javadoc</classifier>
+                                    <version>2.0-beta-1</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/xwork-apidocs</outputDirectory>
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index 49a39d2c6..4724a49d6 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -67,6 +67,58 @@
         <outputDirectory>docs/struts2-core</outputDirectory>
       </fileSet>
 
+      <!-- Plugins -->
+      <!-- 
+      <fileSet>
+        <directory>../plugins/$plugin/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-$plugin-plugin</outputDirectory>
+      </fileSet>
+      -->
+      <fileSet>
+        <directory>../plugins/config-browser/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/jasperreports/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-jasperreports-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/jfreechart/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-jfreechart-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/jsf/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-jsf-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/pell-multipart/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-pell-multipart-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/plexus/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-plexus-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/quickstart/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-quickstart-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/struts1/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-struts1-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/sitegraph/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-sitegraph-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/sitemesh/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/tiles/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin</outputDirectory>
+      </fileSet>
+
     <!-- Include the source code in the assembly -->
     <fileSet>
       <directory>../</directory>
diff --git a/src/site/site.xml b/src/site/site.xml
index 65bf909b5..aa39e65a9 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -75,62 +75,60 @@
 
            <item
                     name="Config Browser"
-                    href="struts2-plugins/struts2-config-browser-plugin/apidocs/"
+                    href="struts2-plugins/struts2-config-browser-plugin/apidocs/index.html"
                     />
 
            <item
                     name="JasperReports"
-                    href="struts2-plugins/struts2-jasperreports-plugin/apidocs/"
+                    href="struts2-plugins/struts2-jasperreports-plugin/apidocs/index.html"
                     />
 
             <item
                     name="JavaServer Faces"
-                    href="struts2-plugins/struts2-jsf-plugin/apidocs/"
+                    href="struts2-plugins/struts2-jsf-plugin/apidocs/index.html"
                     />
 
            <item
                     name="JFreeChart"
-                    href="struts2-plugins/struts2-jfreechart-plugin/apidocs/"
+                    href="struts2-plugins/struts2-jfreechart-plugin/apidocs/index.html"
                     />
 
            <item
                     name="Pell Multipart"
-                    href="struts2-plugins/struts2-pell-multipart-plugin/apidocs/"
+                    href="struts2-plugins/struts2-pell-multipart-plugin/apidocs/index.html"
                     />
 
            <item
                     name="Plexus"
-                    href="struts2-plugins/struts2-plexus-plugin/apidocs/"
+                    href="struts2-plugins/struts2-plexus-plugin/apidocs/index.html"
                     />
 
            <item
                     name="QuickStart"
-                    href="struts2-plugins/struts2-quickstart-plugin/apidocs/"
+                    href="struts2-plugins/struts2-quickstart-plugin/apidocs/index.html"
                     />
 
            <item
                     name="Sitegraph"
-                    href="struts2-plugins/struts2-sitegraph-plugin/apidocs/"
+                    href="struts2-plugins/struts2-sitegraph-plugin/apidocs/index.html"
                     />
 
            <item
                     name="Sitemesh"
-                    href="struts2-plugins/struts2-sitemesh-plugin/apidocs/"
+                    href="struts2-plugins/struts2-sitemesh-plugin/apidocs/index.html"
                     />
 
            <item
                     name="Struts 1"
-                    href="struts2-plugins/struts2-struts1-plugin/apidocs/"
+                    href="struts2-plugins/struts2-struts1-plugin/apidocs/index.html"
                     />
 
-
            <item
                     name="Tiles"
-                    href="struts2-plugins/struts2-tiles-plugin/apidocs/"
+                    href="struts2-plugins/struts2-tiles-plugin/apidocs/index.html"
                     />
 
 
         </menu>
-        ${reports}
     </body>
 </project>