diff --git a/build.gradle b/build.gradle
index 075dc66d..6cad0cec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -122,7 +122,6 @@ javadoc {
 
   configure(options) {
       stylesheetFile = file("$buildDir/shared-resources/javadoc/spring-javadoc.css")
-      overview = "${srcDir}/overview.html"
       docFilesSubDirs = true
       outputLevel = org.gradle.external.javadoc.JavadocOutputLevel.QUIET
       breakIterator = true
@@ -178,22 +177,24 @@ referencePdf {
 }
 
 asciidoctor {
+    sourceDir = file("${projectDir}/src/main/asciidoc")
     dependsOn = [ 'extractSharedResources' ]
     backends = [ 'html5', 'docbook' ]
     options = [
         doctype: 'book',
         eruby: 'erubis',
         attributes: [
-            linkcss: true,
+            basedocdir: "${projectDir}/src/main/asciidoc",
             copycss : "$buildDir/shared-resources/asciidoc/spring.css",
             icons : 'font',
-            'source-highlighter': 'prettify',
-            sectanchors : true,
-            toclevels: '3',
-            sectids: false,
+            linkcss: true,
             numbered: true,
-            version: project.version,
+            sectanchors : true,
+            sectids: false,
+            'source-highlighter': 'prettify',
             stylesheet: "spring.css",
+            toclevels: '3',
+            version: project.version,
         ]
     ]
 }
diff --git a/pom.xml b/pom.xml
index e81e744d..7852a0cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,6 +134,14 @@
 			<plugin>
 				<groupId>org.asciidoctor</groupId>
 				<artifactId>asciidoctor-maven-plugin</artifactId>
+				<configuration>
+					<attributes>
+						<basedocdir>${project.basedir}/src/main/asciidoc</basedocdir>
+						<doctype>book</doctype>
+						<version>${project.version}</version>
+						<!-- TODO include other attributes from build.gradle! -->
+					</attributes>
+				</configuration>
 			</plugin>
 
 		</plugins>
diff --git a/src/main/asciidoc/appendix/appendix-schema.adoc b/src/main/asciidoc/appendix/appendix-schema.adoc
index 56905b97..34749a35 100644
--- a/src/main/asciidoc/appendix/appendix-schema.adoc
+++ b/src/main/asciidoc/appendix/appendix-schema.adoc
@@ -1,19 +1,19 @@
 [[appendix-schema]]
 [appendix]
 = Spring Data GemFire Schema
-:resourcesDir: ../../main/resources
+:resourcesDir: {basedocdir}/../resources
 
 == Spring Data GemFire Core Schema (gfe)
 
 [source,xml]
 ----
-include::{resourcesDir}/org/springframework/data/gemfire/config/spring-gemfire-1.3.xsd[]
+include::{resourcesDir}/org/springframework/data/gemfire/config/spring-gemfire-1.8.xsd[]
 ----
 
 == Spring Data GemFire Data Access Schema (gfe-data)
 
 [source,xml]
 ----
-include::{resourcesDir}/org/springframework/data/gemfire/config/spring-data-gemfire-1.3.xsd[]
+include::{resourcesDir}/org/springframework/data/gemfire/config/spring-data-gemfire-1.8.xsd[]
 ----
 
diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc
index f0905de7..0ee2f1f8 100644
--- a/src/main/asciidoc/index.adoc
+++ b/src/main/asciidoc/index.adoc
@@ -5,7 +5,7 @@ Costin Leau , David Turanski , John Blum , Oliver Gierke
 :revdate: {localdate}
 :toc:
 :toc-placement!:
-:spring-data-commons-docs: {baseDir}/../../../spring-data-commons/src/main/asciidoc
+:spring-data-commons-docs: {basedocdir}/../../../../spring-data-commons/src/main/asciidoc
 
 (C) 2011-2015 The original authors.
 
diff --git a/src/main/asciidoc/reference/bootstrap.adoc b/src/main/asciidoc/reference/bootstrap.adoc
index 3510db4c..494a268c 100644
--- a/src/main/asciidoc/reference/bootstrap.adoc
+++ b/src/main/asciidoc/reference/bootstrap.adoc
@@ -90,9 +90,9 @@ prefix declaration above:
 ====
 
 :leveloffset: +1
-include::cache.adoc[]
-include::data-access.adoc[]
-include::region.adoc[]
+include::{basedocdir}/reference/cache.adoc[]
+include::{basedocdir}/reference/data-access.adoc[]
+include::{basedocdir}/reference/region.adoc[]
 :leveloffset: -1
 
 [[bootstrap:indicies]]
@@ -118,8 +118,8 @@ This allows one to declare any number of indices on any Region whether they are
 but one can customize it accordingly or use a pool (if need be) - see the namespace schema for the full set of options.
 
 :leveloffset: +1
-include::diskstore.adoc[]
-include::snapshot.adoc[]
-include::function.adoc[]
-include::gateway.adoc[]
+include::{basedocdir}/reference/diskstore.adoc[]
+include::{basedocdir}/reference/snapshot.adoc[]
+include::{basedocdir}/reference/function.adoc[]
+include::{basedocdir}/reference/gateway.adoc[]
 :leveloffset: -1
diff --git a/src/main/asciidoc/reference/data.adoc b/src/main/asciidoc/reference/data.adoc
index 0ffee84d..a5bcec07 100644
--- a/src/main/asciidoc/reference/data.adoc
+++ b/src/main/asciidoc/reference/data.adoc
@@ -82,7 +82,7 @@ NOTE: The example above can be simplified even more by eliminating the `cache-re
 Currently, GemFire supports optimistic transactions with *read committed* isolation. Furthermore, to guarantee this isolation, developers should avoid making *in-place* changes that manually modify values present in the Cache. To prevent this from happening, the transaction manager configures the Cache to use *copy on read* semantics, meaning a clone of the actual value is created, each time a read is performed. This behavior can be disabled if needed through the `copyOnRead` property. For more information on the semantics of the underlying GemFire transaction manager, see the GemFire http://gemfire.docs.pivotal.io/latest/javadocs/japi/com/gemstone/gemfire/cache/CacheTransactionManager.html[documentation].
 
 :leveloffset: +1
-include::cq-container.adoc[]
+include::{basedocdir}/reference/cq-container.adoc[]
 :leveloffset: -1
 
 [[apis:declarable]]