diff --git a/activemq-book/pom.xml b/activemq-book/pom.xml
index 7743d742af..19d4b07ccf 100644
--- a/activemq-book/pom.xml
+++ b/activemq-book/pom.xml
@@ -1,60 +1,103 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-book</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>activemq-parent</artifactId>
+    <version>4.2-SNAPSHOT</version>
+  </parent>
 
+  <artifactId>activemq-book</artifactId>
   <packaging>pom</packaging>
+  <name>ActiveMQ User Guide</name>
+  <description>The ActiveMQ User Guide which generates HTML, PDF and man pages.</description>
 
-  <name>ActiveMQ Book</name>
-  <description>The ActiveMQ Book</description>
+  <repositories>
+    <repository>
+      <id>agilejava</id>
+      <name>AgileJava</name>
+      <url>http://agilejava.com/maven/</url>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>agilejava</id>
+      <name>AgileJava</name>
+      <url>http://agilejava.com/maven/</url>
+    </pluginRepository>
+  </pluginRepositories>
 
 
-<repositories>
-  <repository>
-    <id>agilejava</id>
-    <name>AgileJava</name>
-    <url>http://agilejava.com/maven/</url>
-  </repository>
-</repositories>
-<pluginRepositories>
-  <pluginRepository>
-    <id>agilejava</id>
-    <name>AgileJava</name>
-    <url>http://agilejava.com/maven/</url>
-  </pluginRepository>
-</pluginRepositories>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.agilejava.docbkx</groupId>
+        <artifactId>docbkx-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-html</goal>
+              <goal>generate-pdf</goal>
+              <goal>generate-manpages</goal>
+            </goals>
+            <phase>generate-sources</phase>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.docbook</groupId>
+            <artifactId>docbook-xml</artifactId>
+            <version>4.4</version>
+            <scope>runtime</scope>
+          </dependency>
+        </dependencies>
 
+        <configuration>
+          <entities>
+            <entity>
+              <name>version</name>
+              <value>${version}</value>
+            </entity>
+          </entities>
 
-<build>
-  <plugins>
-    <plugin>
-      <groupId>com.agilejava.docbkx</groupId>
-      <artifactId>docbkx-maven-plugin</artifactId>
-      <executions>
-        <execution>
-          <goals>
-            <goal>generate-html</goal>
-            <goal>generate-pdf</goal>
-            <goal>generate-manpages</goal>
-          </goals>
-          <phase>generate-sources</phase>
-        </execution>
-      </executions>
-      <dependencies>
-        <dependency>
-          <groupId>org.docbook</groupId>
-          <artifactId>docbook-xml</artifactId>
-          <version>4.4</version>
-          <scope>runtime</scope>
-        </dependency>
-      </dependencies>
-    </plugin>
-  </plugins>
-</build>
-<properties>
-  <example.title>Multiple output formats</example.title>
-</properties>
+          <!-- lets use separate pages per chapter for HTML -->
+          <chunkedOutput>true</chunkedOutput>
+
+          <!--<xincludeSupport>true</xincludeSupport>-->
+          
+          <!--
+          <sourceDirectory>target/docbkx</sourceDirectory>
+          <preProcess>
+            <ant target="generate-manual" inheritAll="true"/>
+          </preProcess>
+          -->
+          <!--<htmlStylesheet>http://agilejava.com/downloads/kubrick-docbkx.css</htmlStylesheet>-->
+          <headerRule>0</headerRule>
+          <footerRule>0</footerRule>
+          <draftMode>0</draftMode>
+          <bodyFontFamily>Helvetica</bodyFontFamily>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file
diff --git a/activemq-book/src/docbkx/activemq.xml b/activemq-book/src/docbkx/activemq.xml
index c81bec148d..6f659e6bab 100644
--- a/activemq-book/src/docbkx/activemq.xml
+++ b/activemq-book/src/docbkx/activemq.xml
@@ -1,27 +1,106 @@
 <?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">
-<book>
-  <title>The Apache ActiveMQ Book</title>
 
-  <chapter id="chapter1">
-    <title>What is Apache ActiveMQ?</title>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+        "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<book>
+  <bookinfo>
+    <title>Apache ActiveMQ - User Guide</title>
+    <releaseinfo>4.2</releaseinfo>
+    <authorgroup>
+      <author>
+        <firstname>James</firstname>
+        <surname>Strachan</surname>
+      </author>
+      <author>
+        <firstname>Brian</firstname>
+        <surname>McCallister</surname>
+      </author>
+    </authorgroup>
+    <legalnotice>
+      <para>
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements. See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to You under the Apache License, Version 2.0
+        (the "License"); you may not use this file except in compliance with
+        the License. You may obtain a copy of the License at
+      </para>
+
+      <para>
+        http://www.apache.org/licenses/LICENSE-2.0
+      </para>
+
+      <para>
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+      </para>
+    </legalnotice>
+  </bookinfo>
+  <toc/>
+
+
+  <chapter id="introduction">
+    <title>Introduction</title>
+    <para></para>
 
     <para>Apache ActiveMQ is the most popular and powerful open source Message
-    Broker available today. Its hosted at Apache and is distributed under the
-    Apache Software License (2.0).</para>
+      Broker available today. Its hosted at Apache and is distributed under the
+      Apache Software License (2.0).
+    </para>
 
-    <para>Apache ActiveMQ supports</para>
+    <section id="introduction-overview">
+      <title>Overview</title>
+      <para></para>
+    </section>
+  </chapter>
+
+  <chapter id="installation">
+    <title>Installing Apache ActiveMQ</title>
+
+    <para>The first thing you need to do is install Apache ActiveMQ from a binary distribution.
+    </para>
 
     <para></para>
   </chapter>
 
-  <chapter id="chapter2">
-    <title>Getting Started</title>
+  <chapter id="running-broker">
+    <title>Running a Broker</title>
 
-    <para>First you will need to download Apache ActiveMQ from the site.</para>
 
-    <para>Apache ActiveMQ supports</para>
+    <para>The most typical deployment of Apache ActiveMQ, particularly if persistent messaging is to be used is for
+      brokers to be run on the network somewhere. This chapter takes you through running a broker as a stand alone
+      process.
+    </para>
+
+    <para></para>
+  </chapter>
+
+  <chapter id="java-client">
+    <title>Using the Java Client</title>
+
+    <para>Apache ActiveMQ fully supports the JMS 1.1 and J2EE 1.4 specifications so feel free to follow any
+      documentation you have on JMS or J2EE for more background.
+    </para>
 
     <para></para>
   </chapter>