diff --git a/spring-cloud-stream-docs/pom.xml b/spring-cloud-stream-docs/pom.xml
index 75fd1f4e3..4f53a9d67 100644
--- a/spring-cloud-stream-docs/pom.xml
+++ b/spring-cloud-stream-docs/pom.xml
@@ -114,6 +114,28 @@
 						<groupId>org.asciidoctor</groupId>
 						<artifactId>asciidoctor-maven-plugin</artifactId>
 						<version>1.5.3</version>
+						<dependencies>
+							<dependency>
+								<groupId>org.asciidoctor</groupId>
+								<artifactId>asciidoctorj-pdf</artifactId>
+								<version>1.5.0-alpha.11</version>
+							</dependency>
+						</dependencies>
+						<configuration>
+							<sourceDocumentName>index.adoc</sourceDocumentName>
+							<doctype>book</doctype>
+							<attributes>
+								<allow-uri-read>true</allow-uri-read>
+								<attribute-missing>warn</attribute-missing>
+								<project-version>${project.version}</project-version>
+								<project-artifactId>${project.artifactId}</project-artifactId>
+								<version-type-lowercase>${version-type-lowercase}</version-type-lowercase>
+								<snippets>${basedir}/target/generated-snippets</snippets>
+								<spring-cloud-stream-version>${project.version}</spring-cloud-stream-version>
+								<spring-cloud-stream-docs-version>${project.version}</spring-cloud-stream-docs-version>
+								<github-tag>${github-tag}</github-tag>
+							</attributes>
+						</configuration>
 						<executions>
 							<execution>
 								<id>generate-docbook</id>
@@ -127,11 +149,19 @@
 									<doctype>book</doctype>
 									<attributes>
 										<docinfo>true</docinfo>
-										<allow-uri-read>true</allow-uri-read>
-										<attribute-missing>warn</attribute-missing>
-										<spring-cloud-stream-version>${project.version}</spring-cloud-stream-version>
-										<spring-cloud-stream-docs-version>${project.version}</spring-cloud-stream-docs-version>
-										<github-tag>${github-tag}</github-tag>
+									</attributes>
+								</configuration>
+							</execution>
+							<execution>
+								<id>generate-html5</id>
+								<phase>prepare-package</phase>
+								<goals>
+									<goal>process-asciidoc</goal>
+								</goals>
+								<configuration>
+									<backend>html5</backend>
+									<attributes>
+										<toc2 />
 									</attributes>
 								</configuration>
 							</execution>
@@ -151,6 +181,7 @@
 							<foCustomization>${basedir}/src/main/docbook/xsl/pdf.xsl</foCustomization>
 							<useExtensions>1</useExtensions>
 							<admonGraphics>1</admonGraphics>
+
 							<highlightSource>1</highlightSource>
 							<highlightXslthlConfig>${basedir}/src/main/docbook/xsl/xslthl-config.xml</highlightXslthlConfig>
 							<preProcess>
@@ -178,30 +209,6 @@
 							</dependency>
 						</dependencies>
 						<executions>
-							<execution>
-								<id>html-single</id>
-								<goals>
-									<goal>generate-html</goal>
-								</goals>
-								<phase>prepare-package</phase>
-								<configuration>
-									<htmlCustomization>${basedir}/src/main/docbook/xsl/html-singlepage.xsl</htmlCustomization>
-									<targetDirectory>${basedir}/target/docbook/htmlsingle</targetDirectory>
-									<postProcess>
-										<copy todir="${basedir}/target/contents/reference/htmlsingle">
-											<fileset dir="${basedir}/target/docbook/htmlsingle">
-												<include name="**/*.html" />
-											</fileset>
-										</copy>
-										<copy todir="${basedir}/target/contents/reference/htmlsingle/images">
-											<fileset dir="${basedir}/target/generated-docs/images" />
-										</copy>
-										<copy todir="${basedir}/target/contents/reference/htmlsingle/css">
-											<fileset dir="${basedir}/src/main/docbook/css" />
-										</copy>
-									</postProcess>
-								</configuration>
-							</execution>
 							<execution>
 								<id>html</id>
 								<goals>
@@ -257,7 +264,7 @@
 									<targetDirectory>${basedir}/target/docbook/epub</targetDirectory>
 									<preProcess>
 										<copy todir="${basedir}/target/docbook/epub/images">
-											<fileset dir="${basedir}/target/generated-docs/images" />
+											<fileset dir="${basedir}/src/main/docbook/images" />
 										</copy>
 									</preProcess>
 									<postProcess>
@@ -275,6 +282,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
+						<version>1.8</version>
 						<dependencies>
 							<dependency>
 								<groupId>ant-contrib</groupId>
@@ -310,6 +318,10 @@
 										<zip destfile="${project.build.directory}/${project.artifactId}-${project.version}.zip">
 											<zipfileset src="${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar" prefix="api" />
 											<fileset dir="${project.build.directory}/contents" />
+											<zipfileset dir="${project.build.directory}/generated-docs" prefix="reference/htmlsingle">
+												<include name="index.html" />
+												<include name="images/**" />
+											</zipfileset>
 										</zip>
 									</target>
 								</configuration>
@@ -343,6 +355,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>build-helper-maven-plugin</artifactId>
+						<version>1.9.1</version>
 						<executions>
 							<execution>
 								<id>attach-zip</id>
diff --git a/spring-cloud-stream-docs/src/main/asciidoc/index-docinfo.xml b/spring-cloud-stream-docs/src/main/asciidoc/index-docinfo.xml
index ce510697b..566806182 100644
--- a/spring-cloud-stream-docs/src/main/asciidoc/index-docinfo.xml
+++ b/spring-cloud-stream-docs/src/main/asciidoc/index-docinfo.xml
@@ -1,7 +1,7 @@
 <productname>Spring Cloud Stream</productname>
 <releaseinfo>{spring-cloud-stream-version}</releaseinfo>
 <copyright>
-	<year>2013-2016</year>
+	<year>2013-2017</year>
 	<holder>Pivotal Software, Inc.</holder>
 </copyright>
 <legalnotice>