diff --git a/spring-integration-kotlin-dsl/build.gradle b/spring-integration-kotlin-dsl/build.gradle
index f111f42..aebc7fa 100644
--- a/spring-integration-kotlin-dsl/build.gradle
+++ b/spring-integration-kotlin-dsl/build.gradle
@@ -122,7 +122,7 @@ jacocoTestReport {
 
 task api(type: org.jetbrains.dokka.gradle.DokkaTask) {
     outputFormat = 'html'
-    outputDirectory = "$buildDir/javadoc"
+    outputDirectory = "$buildDir/api"
     externalDocumentationLink {
         url = new URL("https://docs.spring.io/spring-integration/docs/$springIntegrationVersion/api/")
     }
@@ -160,7 +160,15 @@ sonarqube {
     }
 }
 
-task distZip(type: Zip) {
+task docsZip(type: Zip) {
+    group = 'Distribution'
+    archiveClassifier = 'docs'
+        from(api) {
+        into 'api'
+    }
+}
+
+task distZip(type: Zip, dependsOn: docsZip) {
     group = 'Distribution'
     archiveClassifier = 'dist'
     description = "Builds -${archiveClassifier} archive, containing all jars and docs, " +
@@ -179,12 +187,15 @@ task distZip(type: Zip) {
         from project.sourcesJar
         from project.javadocJar
     }
+
+    from(zipTree(docsZip.archivePath)) {
+        into "${baseDir}/docs"
+    }
 }
 
 artifacts {
-    archives sourcesJar
-    archives javadocJar
     archives distZip
+    archives docsZip
 }
 
 task dist(dependsOn: assemble) {