diff --git a/README.adoc b/README.adoc
index ddff42b6f..73a2a204f 100644
--- a/README.adoc
+++ b/README.adoc
@@ -657,7 +657,7 @@ Notice that the count property in the `x-death` header is a `Long`.
 == Error Channels
 
 Starting with version 1.3, the binder unconditionally sends exceptions to an error channel for each consumer destination and can also be configured to send async producer send failures to an error channel.
-See "`<<binder-error-channels>>`" for more information.
+See "`<<spring-cloud-stream-overview-error-handling>>`" for more information.
 
 RabbitMQ has two types of send failures:
 
@@ -667,7 +667,7 @@ RabbitMQ has two types of send failures:
 The latter is rare.
 According to the RabbitMQ documentation "[A nack] will only be delivered if an internal error occurs in the Erlang process responsible for a queue.".
 
-As well as enabling producer error channels (as described in "`<<binder-error-channels>>`"), the RabbitMQ binder only sends messages to the channels if the connection factory is appropriately configured, as follows:
+As well as enabling producer error channels (as described in "`<<spring-cloud-stream-overview-error-handling>>`"), the RabbitMQ binder only sends messages to the channels if the connection factory is appropriately configured, as follows:
 
 * `ccf.setPublisherConfirms(true);`
 * `ccf.setPublisherReturns(true);`
diff --git a/docs/pom.xml b/docs/pom.xml
index e21a23e4b..af4c6fa96 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -15,8 +15,11 @@
 	<properties>
 		<docs.main>spring-cloud-stream-binder-rabbit</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
+		<spring-doc-resources.version>0.1.0.RELEASE</spring-doc-resources.version>
+		<spring-asciidoctor-extensions.version>0.1.0.RELEASE
+		</spring-asciidoctor-extensions.version>
+		<asciidoctorj-pdf.version>1.5.0-alpha.16</asciidoctorj-pdf.version>
 	</properties>
-
 	<profiles>
 		<profile>
 			<id>docs</id>
@@ -25,21 +28,290 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-dependency-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<groupId>org.asciidoctor</groupId>
-						<artifactId>asciidoctor-maven-plugin</artifactId>
+						<version>${maven-dependency-plugin.version}</version>
 						<inherited>false</inherited>
-					</plugin>
-					<plugin>
-						<groupId>com.agilejava.docbkx</groupId>
-						<artifactId>docbkx-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>unpack-docs</id>
+								<phase>generate-resources</phase>
+								<goals>
+									<goal>unpack</goal>
+								</goals>
+								<configuration>
+									<artifactItems>
+										<artifactItem>
+											<groupId>org.springframework.cloud
+											</groupId>
+											<artifactId>spring-cloud-build-docs
+											</artifactId>
+											<version>${spring-cloud-build.version}
+											</version>
+											<classifier>sources</classifier>
+											<type>jar</type>
+											<overWrite>false</overWrite>
+											<outputDirectory>${docs.resources.dir}
+											</outputDirectory>
+										</artifactItem>
+									</artifactItems>
+								</configuration>
+							</execution>
+							<execution>
+								<id>unpack-docs-resources</id>
+								<phase>generate-resources</phase>
+								<goals>
+									<goal>unpack</goal>
+								</goals>
+								<configuration>
+									<artifactItems>
+										<artifactItem>
+											<groupId>io.spring.docresources</groupId>
+											<artifactId>spring-doc-resources</artifactId>
+											<version>${spring-doc-resources.version}</version>
+											<type>zip</type>
+											<overWrite>true</overWrite>
+											<outputDirectory>${project.build.directory}/refdocs/</outputDirectory>
+										</artifactItem>
+									</artifactItems>
+								</configuration>
+							</execution>
+						</executions>
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<inherited>false</inherited>
+						<artifactId>maven-resources-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-asciidoc-resources</id>
+								<phase>generate-resources</phase>
+								<goals>
+									<goal>copy-resources</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${project.build.directory}/refdocs/</outputDirectory>
+									<resources>
+										<resource>
+											<directory>src/main/asciidoc</directory>
+											<filtering>false</filtering>
+											<excludes>
+												<exclude>ghpages.sh</exclude>
+											</excludes>
+										</resource>
+									</resources>
+								</configuration>
+							</execution>
+						</executions>
 					</plugin>
+
+					<plugin>
+						<groupId>org.asciidoctor</groupId>
+						<artifactId>asciidoctor-maven-plugin</artifactId>
+						<version>${asciidoctor-maven-plugin.version}</version>
+						<inherited>false</inherited>
+						<dependencies>
+							<dependency>
+								<groupId>io.spring.asciidoctor</groupId>
+								<artifactId>spring-asciidoctor-extensions</artifactId>
+								<version>${spring-asciidoctor-extensions.version}</version>
+							</dependency>
+							<dependency>
+								<groupId>org.asciidoctor</groupId>
+								<artifactId>asciidoctorj-pdf</artifactId>
+								<version>${asciidoctorj-pdf.version}</version>
+							</dependency>
+						</dependencies>
+						<configuration>
+							<sourceDirectory>${project.build.directory}/refdocs/</sourceDirectory>
+							<sourceDocumentName>${docs.main}.adoc</sourceDocumentName>
+							<attributes>
+            						<spring-cloud-stream-version>${project.version}</spring-cloud-stream-version>
+        					</attributes>
+						</configuration>
+						<executions>
+							<execution>
+								<id>generate-html-documentation</id>
+								<phase>prepare-package</phase>
+								<goals>
+									<goal>process-asciidoc</goal>
+								</goals>
+								<configuration>
+									<backend>html5</backend>
+									<sourceHighlighter>highlight.js</sourceHighlighter>
+									<doctype>book</doctype>
+									<attributes>
+										// these attributes are required to use the doc resources
+										<docinfo>shared</docinfo>
+										<stylesdir>css/</stylesdir>
+										<stylesheet>spring.css</stylesheet>
+										<linkcss>true</linkcss>
+										<icons>font</icons>
+										<highlightjsdir>js/highlight</highlightjsdir>
+										<highlightjs-theme>atom-one-dark-reasonable</highlightjs-theme>
+										<allow-uri-read>true</allow-uri-read>
+										<nofooter />
+										<toc>left</toc>
+										<toc-levels>4</toc-levels>
+										<spring-cloud-version>${project.version}</spring-cloud-version>
+										<sectlinks>true</sectlinks>
+									</attributes>
+									<outputFile>${docs.main}.html</outputFile>
+								</configuration>
+							</execution>
+							<execution>
+								<id>generate-docbook</id>
+								<phase>none</phase>
+								<goals>
+									<goal>process-asciidoc</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>generate-index</id>
+								<phase>none</phase>
+								<goals>
+									<goal>process-asciidoc</goal>
+								</goals>
+							</execution>
+
+						</executions>
+					</plugin>
+
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<version>${maven-antrun-plugin.version}</version>
+						<dependencies>
+							<dependency>
+								<groupId>ant-contrib</groupId>
+								<artifactId>ant-contrib</artifactId>
+								<version>1.0b3</version>
+								<exclusions>
+									<exclusion>
+										<groupId>ant</groupId>
+										<artifactId>ant</artifactId>
+									</exclusion>
+								</exclusions>
+							</dependency>
+							<dependency>
+								<groupId>org.apache.ant</groupId>
+								<artifactId>ant-nodeps</artifactId>
+								<version>1.8.1</version>
+							</dependency>
+							<dependency>
+								<groupId>org.tigris.antelope</groupId>
+								<artifactId>antelopetasks</artifactId>
+								<version>3.2.10</version>
+							</dependency>
+							<dependency>
+								<groupId>org.jruby</groupId>
+								<artifactId>jruby-complete</artifactId>
+								<version>1.7.17</version>
+							</dependency>
+							<dependency>
+								<groupId>org.asciidoctor</groupId>
+								<artifactId>asciidoctorj</artifactId>
+								<version>1.5.8</version>
+							</dependency>
+						</dependencies>
+						<executions>
+							<execution>
+								<id>readme</id>
+								<phase>process-resources</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<java classname="org.jruby.Main" failonerror="yes">
+											<arg
+												value="${docs.resources.dir}/ruby/generate_readme.sh" />
+											<arg value="-o" />
+											<arg value="${main.basedir}/README.adoc" />
+										</java>
+									</target>
+								</configuration>
+							</execution>
+							<execution>
+								<id>assert-no-unresolved-links</id>
+								<phase>prepare-package</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<fileset id="unresolved.file"
+											dir="${basedir}/target/generated-docs/" includes="**/*.html">
+											<contains text="Unresolved" />
+										</fileset>
+										<fail message="[Unresolved] Found...failing">
+											<condition>
+												<resourcecount when="greater" count="0"
+													refid="unresolved.file" />
+											</condition>
+										</fail>
+									</target>
+								</configuration>
+							</execution>
+							<execution>
+								<id>setup-maven-properties</id>
+								<phase>validate</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<exportAntProperties>true</exportAntProperties>
+									<target>
+										<taskdef
+											resource="net/sf/antcontrib/antcontrib.properties" />
+										<taskdef name="stringutil"
+											classname="ise.antelope.tasks.StringUtilTask" />
+										<var name="version-type" value="${project.version}" />
+										<propertyregex property="version-type"
+											override="true" input="${version-type}" regexp=".*\.(.*)"
+											replace="\1" />
+										<propertyregex property="version-type"
+											override="true" input="${version-type}" regexp="(M)\d+"
+											replace="MILESTONE" />
+										<propertyregex property="version-type"
+											override="true" input="${version-type}" regexp="(RC)\d+"
+											replace="MILESTONE" />
+										<propertyregex property="version-type"
+											override="true" input="${version-type}" regexp="BUILD-(.*)"
+											replace="SNAPSHOT" />
+										<stringutil string="${version-type}"
+											property="spring-cloud-repo">
+											<lowercase />
+										</stringutil>
+										<var name="github-tag" value="v${project.version}" />
+										<propertyregex property="github-tag"
+											override="true" input="${github-tag}" regexp=".*SNAPSHOT"
+											replace="master" />
+									</target>
+								</configuration>
+							</execution>
+							<execution>
+								<id>copy-css</id>
+								<phase>none</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>generate-documentation-index</id>
+								<phase>none</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>copy-generated-html</id>
+								<phase>none</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+
+						</executions>
+					</plugin>
+
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>build-helper-maven-plugin</artifactId>
diff --git a/docs/src/main/asciidoc/spring-cloud-stream-binder-rabbit.adoc b/docs/src/main/asciidoc/spring-cloud-stream-binder-rabbit.adoc
index 40a6d4000..de5323901 100644
--- a/docs/src/main/asciidoc/spring-cloud-stream-binder-rabbit.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-stream-binder-rabbit.adoc
@@ -30,6 +30,8 @@ Sabby Anandan, Marius Bogoevici, Eric Bottard, Mark Fisher, Ilayaperumal Gopinat
 :sc-ext: java
 // ======================================================================================
 
+*{spring-cloud-stream-version}*
+
 = Reference Guide
 
 include::overview.adoc[]