diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
index 0ad50a1a794..a43f9b423d8 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
@@ -274,7 +274,17 @@
 									<target>
 										<zip
 											destfile="${project.build.directory}/${project.artifactId}-${project.version}-docs.zip">
-											<fileset dir="${project.build.directory}/generated-docs" />
+											<zipfileset
+												src="build/libs/${project.artifactId}-${project.version}-javadoc.jar"
+												prefix="api" />
+											<zipfileset dir="${project.build.directory}/generated-docs/reference/html"
+												prefix="reference/html" />
+											<mappedresources>
+												<fileset dir="${project.build.directory}/generated-docs/reference/pdf"
+													includes="index.pdf" />
+												<globmapper from="index.pdf"
+													to="reference/pdf/spring-boot-gradle-plugin-reference.pdf" />
+											</mappedresources>
 										</zip>
 									</target>
 								</configuration>
@@ -321,6 +331,7 @@
 						</executions>
 						<configuration>
 							<sourceDirectory>${refdocs.build.directory}</sourceDirectory>
+							<sourceDocumentName>index.adoc</sourceDocumentName>
 							<attributes>
 								<github-tag>${github-tag}</github-tag>
 								<version-type>${version-type}</version-type>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/asciidoc/index.adoc b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/asciidoc/index.adoc
index f43fc0c673f..f8da6b914f6 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/asciidoc/index.adoc
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/asciidoc/index.adoc
@@ -32,6 +32,7 @@ Andy Wilkinson
 :github-code: https://github.com/spring-projects/spring-boot/tree/{github-tag}
 
 
+
 [[introduction]]
 == Introduction