diff --git a/docs/build.gradle b/docs/build.gradle
index 0c15eafc5..ebdf04155 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -1,3 +1,6 @@
+import org.apache.tools.ant.filters.FixCrLfFilter
+import org.apache.tools.ant.filters.ReplaceTokens
+
 // -----------------------------------------------------------------------------
 // Configuration for the docs subproject
 // -----------------------------------------------------------------------------
@@ -28,16 +31,22 @@ refSpec = copySpec {
     into ('reference/images') {
         from (imagesDir)
     }
-    //expand(project.properties)
-    filter { String line ->
-        "[$line]"
+    
+    p = new Properties()
+    
+    for (e in project.properties) {
+      if (e.key != null && e.value != null)
+         p.setProperty(e.key, e.value.toString())
     }
+    
+    filter(ReplaceTokens, tokens: p)
 }
 
 task reference (type: Copy) {
     dependsOn 'docbook'
     description = "Builds aggregated DocBook"
     group = "Documentation"
+    logger.info("Version is " + version)
     destinationDir = buildDir
     with(refSpec)
 }
diff --git a/docs/src/reference/docbook/index.xml b/docs/src/reference/docbook/index.xml
index 311f248d4..5e2782b6d 100644
--- a/docs/src/reference/docbook/index.xml
+++ b/docs/src/reference/docbook/index.xml
@@ -7,7 +7,7 @@
     <bookinfo>
         <title>Spring Data Key-Value - Reference Documentation</title>
         <titleabbrev>Spring Data Key-Value ${version}</titleabbrev>
-        <releaseinfo>${version}</releaseinfo>
+        <releaseinfo>@version@</releaseinfo>
         <productname>Spring Data Key-Value</productname>
 
         <authorgroup>
@@ -34,8 +34,8 @@
     </bookinfo>
 
     <toc/>
-
     <xi:include href="preface.xml"/>
+    <!--
 
     <part id="introduction">
       <title>Introduction</title>
@@ -60,7 +60,7 @@
       <xi:include href="appendix/introduction.xml"/>
       <xi:include href="appendix/appendix-schema.xml"/>
     </part>
-
+-->
     <!--
     <part id="resources">
       <title>Other Documentation</title>