diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 3ee356fb4..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "buildSrc"]
-	path = buildSrc
-	url = git@github.com:SpringSource/spring-build-gradle.git
diff --git a/build.gradle b/build.gradle
index 3e04679b0..c36381edc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -63,7 +63,8 @@ configure(javaprojects) {
   apply plugin: 'docbook'
   apply plugin: 'bundlor'  // all core projects should be OSGi-compliant
 
-	[compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:-serial"]
+  bundlor.useProjectProps = true
+[compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:-serial"]
 	
 	// Common dependencies
 	dependencies {
@@ -111,9 +112,14 @@ task dist(type: Zip) {
 
     def zipRootDir = "${project.name}-$version"
     into(zipRootDir) {
-        from('$rootDir/docs/src/info') {
+        from('/docs/src/info') {
             include '*.txt'
         }
+        from('/docs/build/') {
+            into 'docs'
+            include 'reference/**/*'
+            include 'api/**/*'
+        }
         into('dist') {
             from javaprojects.collect {project -> project.libsDir }
         }
diff --git a/docs/build.gradle b/docs/build.gradle
index bc893550a..46b57bb49 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -8,18 +8,18 @@ apply plugin: 'docbook'
 assemble.dependsOn = ['api', 'docbook']
 
 
-docbookHtmlSingle.stylesheet = new File(projectDir, 'docs/src/reference/resources/xsl/html-single-custom.xsl')
+docbookHtmlSingle.stylesheet = new File(projectDir, 'src/reference/resources/xsl/html-single-custom.xsl')
 [docbookHtml, docbookFoPdf, docbookHtmlSingle]*.sourceFileName = 'index.xml'
-[docbookHtml, docbookFoPdf, docbookHtmlSingle]*.sourceDirectory = new File(projectDir, 'docs/src/reference/docbook')
+[docbookHtml, docbookFoPdf, docbookHtmlSingle]*.sourceDirectory = new File(projectDir, 'src/reference/docbook')
 
 docbookHtml.stylesheet = new File(projectDir, 'src/reference/resources/xsl/html-custom.xsl')
 docbookHtmlSingle.stylesheet = new File(projectDir, 'src/reference/resources/xsl/html-single-custom.xsl')
 docbookFoPdf.stylesheet = new File(projectDir, 'src/reference/resources/xsl/pdf-custom.xsl')
 def imagesDir = new File(projectDir, 'src/reference/resources/images');
-docbookFoPdf.admonGraphicsPath = "${imagesDir}/"
+docbookFoPdf.admonGraphicsPath = "${imagesDir}/admon"
 docbookFoPdf.imgSrcPath = "${imagesDir}"
 
-spec = copySpec {
+refSpec = copySpec {
     into ('reference') {
         from("$buildDir/docs")
         from("$projectDir/src/reference/resources")
@@ -29,6 +29,13 @@ spec = copySpec {
     }
 }
 
+task reference (type: Copy) {
+    dependsOn 'docbook'
+    group = 'Documentation'
+    description = "Builds aggregated DocBook"
+    destinationDir = buildDir
+    with(refSpec)
+}
     
 task api(type: Javadoc) {
   group = 'Documentation'
diff --git a/docs/src/reference/docbook/appendix/appendix-schema.xml b/docs/src/reference/docbook/appendix/appendix-schema.xml
index e4a2c4e75..2e23ffcd8 100644
--- a/docs/src/reference/docbook/appendix/appendix-schema.xml
+++ b/docs/src/reference/docbook/appendix/appendix-schema.xml
@@ -3,7 +3,7 @@
     <title>Spring Data Key Value Schema(s)</title>
 
 	<para>Spring Data - Redis support</para>	
-    <programlisting language="xml"><xi:include href="../../../../spring-data-redis/src/main/resources/org/springframework/data/keyvalue/redis/config/spring-redis-1.0.xsd" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude">
+    <programlisting language="xml"><xi:include href="../../../../../spring-data-redis/src/main/resources/org/springframework/data/keyvalue/redis/config/spring-redis-1.0.xsd" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude">
        <xi:fallback>
     	<para><emphasis>FIXME: REDIS SCHEMA LOCATION/NAME CHANGED</emphasis></para>
   	   </xi:fallback>
diff --git a/spring-data-redis/build.gradle b/spring-data-redis/build.gradle
index 896e0b39d..30c57c92b 100644
--- a/spring-data-redis/build.gradle
+++ b/spring-data-redis/build.gradle
@@ -10,8 +10,4 @@ dependencies {
 	compile "org.jredis:jredis-anthonylauzon:$jredisVersion"
 	compile "org.springframework:spring-oxm:$springVersion"
 	compile "commons-beanutils:commons-beanutils-core:1.8.3"
-}
-
-version = "123"
-bundlor.useProjectProps = true
-	
+}