diff --git a/build.gradle b/build.gradle
index 0a37cec56..21cc7d608 100644
--- a/build.gradle
+++ b/build.gradle
@@ -177,7 +177,7 @@ task wrapper(type: Wrapper) {
 task dist(type: Zip) {
     description = "Generate the ZIP Distribution"
     group = "Distribution"
-    dependsOn subprojects*.tasks*.matching { task -> task.name == 'assemble' }
+    dependsOn jar, subprojects*.tasks*.matching { task -> task.name == 'assemble' }
 
     evaluationDependsOn(':docs')
 
@@ -191,6 +191,9 @@ task dist(type: Zip) {
             include 'reference/**/*'
             include 'api/**/*'
         }
+            into('dist') {
+            from javaprojects.collect {project -> project.libsDir }
+        }
     }
     doLast {
         ant.checksum(file: archivePath, algorithm: 'SHA1', fileext: '.sha1')
@@ -205,4 +208,5 @@ task uploadDist(type: org.springframework.gradle.tasks.S3DistroUpload, dependsOn
     projectName = 'Spring Data Key Value'
 }
 
+assemble.dependsOn = ['jar', 'sourceJar', 'javadocJar']
 defaultTasks 'clean', 'build'
\ No newline at end of file
diff --git a/docs/build.gradle b/docs/build.gradle
index dfd2b8c28..9b082ea7c 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -7,7 +7,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 apply plugin: 'base'
 apply plugin: 'docbook'
 
-assemble.dependsOn = [rootProject.javadoc, 'docbook']
+assemble.dependsOn = [rootProject.javadoc, 'reference']
 
 [docbookHtml, docbookFoPdf, docbookHtmlSingle]*.group = 'Documentation'
 [docbookHtml, docbookFoPdf, docbookHtmlSingle]*.sourceFileName = 'index.xml'
diff --git a/maven.gradle b/maven.gradle
index 996d1b693..d381aa2fe 100644
--- a/maven.gradle
+++ b/maven.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'maven'
 
 // Create a source jar for uploading
-task sourceJar(type: Jar, dependsOn: classes) {
+task sourceJar(type: Jar, dependsOn: jar) {
     classifier = 'sources'
     from sourceSets.main.allSource
 }
 
 // Create a javadoc jar for uploading
-task javadocJar(type: Jar, dependsOn: javadoc) {
+task javadocJar(type: Jar, dependsOn: rootProject.javadoc) {
     classifier = 'javadoc'
-    from javadoc.destinationDir
+    from rootProject.javadoc.destinationDir
 }
 
 artifacts {