diff --git a/pom.xml b/pom.xml
index 4b64e8a801..b44f24b99c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,11 +136,6 @@
 			</organization>
 			<timezone>+10</timezone>
 		</developer>
-		<developer>
-			<name>Francois Beausoleil</name>
-			<id>fbos</id>
-			<email>fbos at users.sourceforge.net</email>
-		</developer>
 		<developer>
 			<name>Colin Sampaleanu</name>
 			<id>colins</id>
@@ -155,7 +150,7 @@
 		<developer>
 			<name>Luke Taylor</name>
 			<id>luke_t</id>
-			<email>luke at monkeymachine.ltd.uk</email>
+			<email>luke_t at users.sourceforge.net</email>
 			<organization>
 				Monkey Machine Ltd. (http://monkeymachine.ltd.uk)
 			</organization>
@@ -177,15 +172,11 @@
 			<email>markstg at users.sourceforge.net</email>
 		</developer>
 		<developer>
-			<name>Vishal Puri</name>
-			<id>vishalpuri</id>
-			<email>vishalpuri at users.sourceforge.net</email>
-			<organization>
-				Interface21 Pty Limited (http://www.interface21.com)
-			</organization>
-			<timezone>+10</timezone>
+			<name>John A. Lewis</name>
+			<id>johnalewis</id>
+			<email>johnalewis at users.sourceforge.net</email>
 		</developer>
-	</developers>
+    </developers>
 
 	<contributors>
 		<contributor>
@@ -198,6 +189,9 @@
 			<name>Patrick Burleson</name>
 		</contributor>
 		<contributor>
+			<name>Francois Beausoleil</name>
+		</contributor>
+        <contributor>
 			<name>Wesley Hall</name>
 		</contributor>
 		<contributor>
@@ -236,7 +230,16 @@
 		<contributor>
 			<name>Robin Bramley</name>
 		</contributor>
-	</contributors>
+        <contributor>
+            <name>Robert Sanders</name>
+        </contributor>
+        <contributor>
+            <name>Vishal Puri</name>
+        </contributor>
+        <contributor>
+            <name>Martin Algesten</name>
+        </contributor>
+    </contributors>
 
 	<dependencies>
 		<dependency>
@@ -386,6 +389,52 @@
                 <groupId>com.agilejava.docbkx</groupId>
                 <artifactId>docbkx-maven-plugin</artifactId>
                 <version>2.0.6</version>
+                <executions>
+                    <execution>
+                        <id>build-singlehtml-doc</id>
+                        <phase>pre-site</phase>
+                        <goals>
+                            <goal>generate-html</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirectory>${docbook.source}</sourceDirectory>
+                            <targetDirectory>${docbook.target}</targetDirectory>
+                            <inputs>springsecurity.xml</inputs>
+                            <chunkedOutput>false</chunkedOutput>
+<!--
+                            <htmlStylesheet>css/spring-security-docbook.css</htmlStylesheet>
+                            <htmlCustomization>
+                                ${docbook.source}/resources/xsl/spring-security-docbook-html.xsl
+                            </htmlCustomization>
+-->
+                            <postProcess>
+                                <copy todir="${docbook.target}/images">
+                                    <fileset dir="${docbook.source}/images">
+                                        <include name="*.png"/>
+                                        <include name="*.gif"/>
+                                        <include name="*.jpg"/>
+                                    </fileset>
+                                </copy>
+                            </postProcess>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>build-pdf-doc</id>
+                        <phase>pre-site</phase>
+                        <goals>
+                            <goal>generate-pdf</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirectory>${docbook.source}</sourceDirectory>
+                            <targetDirectory>${docbook.target}</targetDirectory>
+                            <inputs>springsecurity.xml</inputs>
+                            <imgSrcPath>${docbook.source}/</imgSrcPath>
+                            <admonGraphicsPath>${docbook.source}/resources/images/admons/</admonGraphicsPath>
+                            <foCustomization>${docbook.source}/resources/xsl/spring-security-docbook-fopdf.xsl
+                            </foCustomization>
+                        </configuration>
+                    </execution>
+                </executions>
                 <dependencies>
                     <dependency>
                     <groupId>org.docbook</groupId>
@@ -394,9 +443,6 @@
                     <scope>runtime</scope>
                     </dependency>
                 </dependencies>
-                <configuration>
-                    <targetDirectory>${basedir}/target/site/guide</targetDirectory>
-                </configuration>
             </plugin>
         </plugins>
 	</build>
@@ -422,12 +468,6 @@
 					</configLocation>
 				</configuration>
 			</plugin>
--->
-<!--
-            <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-pmd-plugin</artifactId>
-			</plugin>
 -->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -528,6 +568,8 @@
 	</dependencyManagement>
 	<properties>
 		<spring.version>1.2.9</spring.version>
-	</properties>
+        <docbook.source>${basedir}/src/docbkx</docbook.source>
+        <docbook.target>${basedir}/target/site/guide</docbook.target>
+    </properties>
 
 </project>
\ No newline at end of file
diff --git a/src/site/resources/guide/images/ACLSecurity.gif b/src/docbkx/images/ACLSecurity.gif
similarity index 100%
rename from src/site/resources/guide/images/ACLSecurity.gif
rename to src/docbkx/images/ACLSecurity.gif
diff --git a/src/site/resources/guide/images/AccessDecisionVoting.gif b/src/docbkx/images/AccessDecisionVoting.gif
similarity index 100%
rename from src/site/resources/guide/images/AccessDecisionVoting.gif
rename to src/docbkx/images/AccessDecisionVoting.gif
diff --git a/src/site/resources/guide/images/AfterInvocation.gif b/src/docbkx/images/AfterInvocation.gif
similarity index 100%
rename from src/site/resources/guide/images/AfterInvocation.gif
rename to src/docbkx/images/AfterInvocation.gif
diff --git a/src/site/resources/guide/images/Authentication.gif b/src/docbkx/images/Authentication.gif
similarity index 100%
rename from src/site/resources/guide/images/Authentication.gif
rename to src/docbkx/images/Authentication.gif
diff --git a/src/site/resources/guide/images/BasicAclProvider.gif b/src/docbkx/images/BasicAclProvider.gif
similarity index 100%
rename from src/site/resources/guide/images/BasicAclProvider.gif
rename to src/docbkx/images/BasicAclProvider.gif
diff --git a/src/site/resources/guide/images/Context.gif b/src/docbkx/images/Context.gif
similarity index 100%
rename from src/site/resources/guide/images/Context.gif
rename to src/docbkx/images/Context.gif
diff --git a/src/site/resources/guide/images/Permissions.gif b/src/docbkx/images/Permissions.gif
similarity index 100%
rename from src/site/resources/guide/images/Permissions.gif
rename to src/docbkx/images/Permissions.gif
diff --git a/src/site/resources/guide/images/SecurityInterception.gif b/src/docbkx/images/SecurityInterception.gif
similarity index 100%
rename from src/site/resources/guide/images/SecurityInterception.gif
rename to src/docbkx/images/SecurityInterception.gif
diff --git a/src/site/resources/guide/images/logo.gif b/src/docbkx/images/logo.gif
similarity index 100%
rename from src/site/resources/guide/images/logo.gif
rename to src/docbkx/images/logo.gif
diff --git a/src/site/resources/guide/images/logo.psd b/src/docbkx/images/logo.psd
similarity index 100%
rename from src/site/resources/guide/images/logo.psd
rename to src/docbkx/images/logo.psd
diff --git a/src/docbkx/springsecurity.xml b/src/docbkx/springsecurity.xml
index cc076c4d4a..5e6a8f4eee 100644
--- a/src/docbkx/springsecurity.xml
+++ b/src/docbkx/springsecurity.xml
@@ -812,8 +812,14 @@ if (obj instanceof UserDetails) {
               <imagedata align="center"
                          fileref="images/SecurityInterception.gif"
                          format="GIF" />
+
             </imageobject>
+            <imageobject role="fo">
+              <imagedata align="center"
+                         fileref="images/SecurityInterception.gif"
+                         format="GIF" />
 
+            </imageobject>
             <caption>
               <para>Figure 1: The key "secure object" model</para>
             </caption>
@@ -4671,7 +4677,7 @@ public boolean supports(Class clazz);</programlisting></para>
         implementations.</para>
 
         <para><mediaobject>
-            <imageobject role="html">
+            <imageobject>
               <imagedata align="center" fileref="images/AfterInvocation.gif"
                          format="GIF" />
             </imageobject>
diff --git a/src/site/resources/images/logo.gif b/src/site/resources/images/logo.gif
new file mode 100644
index 0000000000..f7765dbbb7
Binary files /dev/null and b/src/site/resources/images/logo.gif differ