diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle
index 010eef3bb46..c7eaa351c01 100644
--- a/spring-boot-project/spring-boot-docs/build.gradle
+++ b/spring-boot-project/spring-boot-docs/build.gradle
@@ -157,19 +157,18 @@ tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
 
 asciidoctor {
 	sources {
-		include "*.htmlsingleadoc"
+		include "*.singleadoc"
 	}
 }
 
 asciidoctorPdf {
 	sources {
-		include "*.pdfadoc"
+		include "*.singleadoc"
 	}
 }
 
 task asciidoctorMultipage(type: org.asciidoctor.gradle.jvm.AsciidoctorTask) {
 	sources {
-		include "*.htmladoc"
 		include "*.adoc"
 	}
 }
@@ -241,6 +240,7 @@ task zip(type: Zip) {
 	}
 	from(asciidoctorPdf.outputDir) {
 		into "reference/pdf"
+		rename "index.pdf", "spring-boot-reference.pdf"
 	}
 	from(asciidoctorMultipage.outputDir) {
 		into "reference/html"
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.htmladoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.adoc
similarity index 100%
rename from spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.htmladoc
rename to spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.adoc
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.htmlsingleadoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.singleadoc
similarity index 100%
rename from spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.htmlsingleadoc
rename to spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.singleadoc
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-reference.pdfadoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-reference.pdfadoc
deleted file mode 100644
index 1e5720829ff..00000000000
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-reference.pdfadoc
+++ /dev/null
@@ -1,28 +0,0 @@
-[[spring-boot-reference-documentation]]
-= Spring Boot Reference Documentation
-Phillip Webb, Dave Syer, Josh Long, Stéphane Nicoll, Rob Winch, Andy Wilkinson, Marcel Overdijk, Christian Dupuis, Sébastien Deleuze, Michael Simons, Vedran Pavić, Jay Bryant, Madhura Bhave
-:docinfo: shared
-include::attributes.adoc[]
-
-include::legal.adoc[leveloffset=+1]
-include::documentation-overview.adoc[leveloffset=+1]
-include::getting-started.adoc[leveloffset=+1]
-include::using-spring-boot.adoc[leveloffset=+1]
-include::spring-boot-features.adoc[leveloffset=+1]
-include::production-ready-features.adoc[leveloffset=+1]
-include::deployment.adoc[leveloffset=+1]
-include::spring-boot-cli.adoc[leveloffset=+1]
-include::build-tool-plugins.adoc[leveloffset=+1]
-include::howto.adoc[leveloffset=+1]
-
-
-
-[[appendix]]
-== Appendices
-
-include::appendix-application-properties.adoc[leveloffset=+2]
-include::appendix-configuration-metadata.adoc[leveloffset=+2]
-include::appendix-auto-configuration-classes.adoc[leveloffset=+2]
-include::appendix-test-auto-configuration.adoc[leveloffset=+2]
-include::appendix-executable-jar-format.adoc[leveloffset=+2]
-include::appendix-dependency-versions.adoc[leveloffset=+2]