diff --git a/doc/pom.xml b/doc/pom.xml
index 91221b43..45d5abba 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -20,7 +20,7 @@
             <plugin>
                 <groupId>com.agilejava.docbkx</groupId>
                 <artifactId>docbkx-maven-plugin</artifactId>
-                <version>1.69.1.7</version>
+                <version>2.0.2</version>
                 <executions>
                     <execution>
                         <goals>
@@ -41,6 +41,7 @@
                 <configuration>
                     <includes>index.xml</includes>
                     <chunkedOutput>true</chunkedOutput>
+                    <xincludeSupport>true</xincludeSupport>                    
                     <entities>
                         <entity>
                             <name>version</name>
diff --git a/doc/src/docbkx/index.xml b/doc/src/docbkx/index.xml
index 7a949f5f..5697ec65 100644
--- a/doc/src/docbkx/index.xml
+++ b/doc/src/docbkx/index.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY preface            SYSTEM "preface.xml">
-<!ENTITY overview           SYSTEM "overview.xml">
-<!ENTITY contract-first     SYSTEM "contract-first.xml">
-<!ENTITY ws                 SYSTEM "ws.xml">
-<!ENTITY security           SYSTEM "security.xml">
-<!ENTITY oxm                SYSTEM "oxm.xml">
-<!ENTITY bibliography       SYSTEM "bibliography.xml">
-]>
-<book>
+        <!ENTITY preface            SYSTEM "preface.xml">
+        <!ENTITY overview           SYSTEM "overview.xml">
+        <!ENTITY contract-first     SYSTEM "contract-first.xml">
+        <!ENTITY ws                 SYSTEM "ws.xml">
+        <!ENTITY security           SYSTEM "security.xml">
+        <!ENTITY oxm                SYSTEM "oxm.xml">
+        <!ENTITY bibliography       SYSTEM "bibliography.xml">
+        ]>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 
     <bookinfo>
         <title>Spring Web Services</title>
@@ -27,7 +27,8 @@
 
         <legalnotice>Copies of this document may be made for your own use and for distribution to others, provided that
             you do not charge any fee for such copies and further provided that each copy contains this Copyright
-            Notice, whether distributed in print or electronically.</legalnotice>
+            Notice, whether distributed in print or electronically.
+        </legalnotice>
     </bookinfo>
 
     <toc/>
diff --git a/doc/src/docbkx/ws.xml b/doc/src/docbkx/ws.xml
index 09eb51e3..aa752e82 100644
--- a/doc/src/docbkx/ws.xml
+++ b/doc/src/docbkx/ws.xml
@@ -11,7 +11,7 @@
     <section>
         <title>MessageDispatcher</title>
         <para>
-            Spring-WS is designed around a central dispatching mechanism, which forwards
+            Spring-WS is designed around a central dispatching mechanism, which received and forwards incoming
         </para>
     </section>
     <section>