diff --git a/assembly/pom.xml b/assembly/pom.xml
index 526a257d1..7a75cb485 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -97,6 +97,23 @@
                             <outputDirectory>${project.build.directory}/apps</outputDirectory>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>xwork-javadoc</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>opensymphony</groupId>
+                                    <artifactId>xwork</artifactId>
+                                    <classifier>javadoc</classifier>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/xwork-apidocs</outputDirectory>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index f167e9984..541142e29 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -46,7 +46,13 @@
         <include>*.war</include>
       </includes>
     </fileSet>
-    
+
+    <!-- Include the XWork Javadoc in the assembly -->
+    <fileSet>
+      <directory>target/xwork-apidocs</directory>
+      <outputDirectory>xwork-apidocs</outputDirectory>
+    </fileSet>
+
     <!-- Include the source code in the assembly -->
     <fileSet>
       <directory>../</directory>
diff --git a/pom.xml b/pom.xml
index cab7363e5..d88f6af46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
         robust client and server side validation, and much more.
     </description>
     -->
-    
+
     <scm>
        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk</connection>
        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk</developerConnection>
@@ -80,7 +80,7 @@
         <!--<module>assembly</module>-->
         <module>api</module>
     </modules>
-    
+
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
@@ -134,8 +134,8 @@
             </dependencies>
         </profile>
     </profiles>
-    
-    
+
+
     <build>
         <pluginManagement>
             <plugins>
@@ -227,7 +227,15 @@
         </plugins>
     </reporting>
 
-    <dependencies/>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>opensymphony</groupId>
+                <artifactId>xwork</artifactId>
+                <version>2.0-SNAPSHOT</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <repositories>
         <repository>