diff --git a/docs/docs.gradle b/docs/docs.gradle
index 2c007650c7..be87d456fc 100644
--- a/docs/docs.gradle
+++ b/docs/docs.gradle
@@ -1,4 +1,5 @@
 // Docbook and Javadoc building and uploading tasks
+apply plugin: 'base'
 
 subprojects {
     apply plugin: 'base'
@@ -104,4 +105,6 @@ task uploadFaq(type: TarUpload) {
     login = docSiteLogin
 
     with(project('faq').spec)
-}
\ No newline at end of file
+}
+
+assemble.dependsOn = [apidocs, 'manual:docbook']
diff --git a/gradle/dist.gradle b/gradle/dist.gradle
index 5a92958404..e1efdb91c3 100644
--- a/gradle/dist.gradle
+++ b/gradle/dist.gradle
@@ -11,7 +11,7 @@ dependencies {
 }
 
 task dist(type: Zip) {
-    dependsOn ':docs:apidocs', ':docs:manual:docbook', subprojects*.tasks*.matching { task -> task.name == 'assemble' }
+    dependsOn subprojects*.tasks*.matching { task -> task.name == 'assemble' }
 
     evaluationDependsOn(':docs')