diff --git a/api/pom.xml b/api/pom.xml
index 1cb5ff9..ef51552 100755
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -18,6 +18,10 @@
     <prerequisites>
         <maven>3.0</maven>
     </prerequisites>
+    
+    <properties>
+        <project.parent.url>${project.artifactId}</project.parent.url>
+    </properties>
 
     <dependencies>
 
diff --git a/dist/pom.xml b/dist/pom.xml
index 5551fac..6751122 100755
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -41,7 +41,6 @@
       <dependency>
          <groupId>com.ctp.cdi.query</groupId>
          <artifactId>cdi-query-api</artifactId>
-         <version>${project.version}</version>
          <classifier>sources</classifier>
          <optional>true</optional>
       </dependency>
@@ -49,7 +48,6 @@
       <dependency>
          <groupId>com.ctp.cdi.query</groupId>
          <artifactId>cdi-query-impl</artifactId>
-         <version>${project.version}</version>
          <classifier>sources</classifier>
          <optional>true</optional>
       </dependency>
@@ -57,18 +55,9 @@
       <dependency>
          <groupId>com.ctp.cdi.query</groupId>
          <artifactId>cdi-query-api</artifactId>
-         <version>${project.version}</version>
          <classifier>javadoc</classifier>
       </dependency>
 
-      <dependency>
-         <groupId>com.ctp.cdi.query</groupId>
-         <artifactId>cdi-query-reference-guide</artifactId>
-         <version>${project.version}</version>
-         <type>war</type>
-         <optional>true</optional>
-      </dependency>
-
    </dependencies>
 
    <build>
diff --git a/docs/pom.xml b/docs/pom.xml
index 771df56..46cca6e 100755
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -9,9 +9,9 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>com.ctp.cdi.query</groupId>
+    <groupId>${project.parent.groupId}</groupId>
     <artifactId>cdi-query-reference-guide</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>${project.parent.version}</version>
     <packaging>jdocbook</packaging>
     <name>CDI Query Reference Guide</name>
 
diff --git a/impl/pom.xml b/impl/pom.xml
index 9e5572c..62b3e9a 100755
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -22,7 +22,6 @@
     
     <properties>
         <version.maven.compiler>2.3.1</version.maven.compiler>
-        <version.maven.site>3.0-beta-2</version.maven.site>
         <version.maven.jxr>2.2</version.maven.jxr>
         <version.maven.surefire>2.8.1</version.maven.surefire>
         <version.maven.checkstyle>2.7-SNAPSHOT</version.maven.checkstyle>
@@ -31,6 +30,7 @@
         <version.maven.cobertura>2.5</version.maven.cobertura>
         <jdk.source>1.6</jdk.source>
         <jdk.target>1.6</jdk.target>
+        <project.parent.url>${project.artifactId}</project.parent.url>
     </properties>
     
     <build>
@@ -46,7 +46,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${version.maven.compiler}</version>
                 <configuration>
                     <source>${jdk.source}</source>
                     <target>${jdk.target}</target>
@@ -149,7 +148,7 @@
                         <artifactId>maven-site-plugin</artifactId>
                         <version>${version.maven.site}</version>
                         <configuration>
-                            <reportPlugins>
+                            <reportPlugins combine.children="append">
                                 <plugin>
                                     <groupId>org.apache.maven.plugins</groupId>
                                     <artifactId>maven-jxr-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index ac82ba3..23a7df0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -31,8 +31,35 @@
         <seam.version>3.0.0.Final</seam.version>
         <emma.version>2.0.5312</emma.version>
         <arquillian.version>1.0.0.Alpha5</arquillian.version>
+        <version.maven.site>3.0-beta-3</version.maven.site>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>${version.maven.site}</version>
+                <configuration>
+                    <reportPlugins combine.children="append">
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-project-info-reports-plugin</artifactId>
+                            <version>2.4</version>
+                            <reportSets>
+                                <reportSet>
+                                    <reports>
+                                        <report>index</report>
+                                    </reports>
+                                </reportSet>
+                            </reportSets>
+                        </plugin>
+                    </reportPlugins>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencyManagement>
         <dependencies>
 
@@ -50,10 +77,31 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.ctp.cdi.query</groupId>
+                <artifactId>cdi-query-api</artifactId>
+                <version>${project.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
+
+            <dependency>
+                <groupId>com.ctp.cdi.query</groupId>
+                <artifactId>cdi-query-api</artifactId>
+                <version>${project.version}</version>
+                <classifier>javadoc</classifier>
+            </dependency>
+
+            <dependency>
+                <groupId>com.ctp.cdi.query</groupId>
+                <artifactId>cdi-query-impl</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.ctp.cdi.query</groupId>
                 <artifactId>cdi-query-impl</artifactId>
                 <version>${project.version}</version>
+                <classifier>sources</classifier>
             </dependency>
 
             <dependency>
@@ -67,7 +115,7 @@
                 <artifactId>weld-core</artifactId>
                 <version>1.1.0.Final</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.hibernate.javax.persistence</groupId>
                 <artifactId>hibernate-jpa-2.0-api</artifactId>
@@ -82,56 +130,56 @@
                 <version>4.8.1</version>
                 <scope>test</scope>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.jboss.arquillian</groupId>
                 <artifactId>arquillian-junit</artifactId>
                 <version>${arquillian.version}</version>
                 <scope>test</scope>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.jboss.arquillian.container</groupId>
                 <artifactId>arquillian-jbossas-managed-6</artifactId>
                 <version>${arquillian.version}</version>
                 <scope>test</scope>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.jboss.jbossas</groupId>
                 <artifactId>jboss-server-manager</artifactId>
                 <version>1.0.3.GA</version>
                 <scope>test</scope>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.jboss.jbossas</groupId>
                 <artifactId>jboss-as-client</artifactId>
                 <version>6.0.0.Final</version>
                 <type>pom</type>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.jboss.arquillian.container</groupId>
                 <artifactId>arquillian-glassfish-embedded-3.1</artifactId>
                 <version>${arquillian.version}</version>
                 <scope>test</scope>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.jboss.arquillian.container</groupId>
                 <artifactId>arquillian-glassfish-embedded-3</artifactId>
                 <version>${arquillian.version}</version>
                 <scope>test</scope>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.glassfish.extras</groupId>
                 <artifactId>glassfish-embedded-all</artifactId>
                 <version>3.1</version>
                 <scope>test</scope>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derby</artifactId>
@@ -267,6 +315,24 @@
                 </pluginManagement>
             </build>
         </profile>
+        <profile>
+            <id>bamboo</id>
+            <distributionManagement>
+                <site>
+                    <id>bamboo-local</id>
+                    <url>file:///${bamboo.build.working.directory}/target/deployed-site</url>
+                </site>
+            </distributionManagement>
+        </profile>
+        <profile>
+            <id>jenkins</id>
+            <distributionManagement>
+                <site>
+                    <id>local-jenkins</id>
+                    <url>file:///${env.WORKSPACE}/target/deployed-site</url>
+                </site>
+            </distributionManagement>
+        </profile>
     </profiles>
 
     <developers>
@@ -289,5 +355,6 @@
         <developerConnection>scm:git:git@github.com:ctpconsulting/query.git</developerConnection>
         <url>http://github.com/ctpconsulting/query</url>
     </scm>
+
 </project>