diff --git a/distribution/docs-dist/assembly.xml b/distribution/docs-dist/assembly.xml
new file mode 100755
index 0000000000..fa4b1b37cf
--- /dev/null
+++ b/distribution/docs-dist/assembly.xml
@@ -0,0 +1,33 @@
+<assembly>
+    <id>docs-dist</id>
+
+    <formats>
+        <format>zip</format>
+        <format>tar.gz</format>
+    </formats>
+
+    <includeBaseDirectory>true</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>../../target/site/apidocs</directory>
+            <outputDirectory>javadocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../../services/target/apidocs</directory>
+            <outputDirectory>rest-api</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../../docbook/target/docbook/publish/en-US</directory>
+            <outputDirectory>userguide</outputDirectory>
+        </fileSet>
+    </fileSets>
+
+    <files>
+        <file>
+            <source>src/index.html</source>
+            <outputDirectory></outputDirectory>
+        </file>
+    </files>
+
+</assembly>
diff --git a/distribution/docs-dist/build.xml b/distribution/docs-dist/build.xml
new file mode 100755
index 0000000000..96fce2314a
--- /dev/null
+++ b/distribution/docs-dist/build.xml
@@ -0,0 +1,122 @@
+<project name="example-dist" basedir="." default="all">
+
+    <target name="all">
+        <delete dir="target/examples"/>
+        <copy todir="target/examples/cors" overwrite="true">
+            <fileset dir="../../examples/cors">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/cordova" overwrite="true">
+            <fileset dir="../../examples/cordova">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/providers" overwrite="true">
+            <fileset dir="../../examples/providers">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/saml" overwrite="true">
+            <fileset dir="../../examples/saml">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/broker/saml-broker-authentication" overwrite="true">
+            <fileset dir="../../examples/broker/saml-broker-authentication">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/js-console" overwrite="true">
+            <fileset dir="../../examples/js-console">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/multi-tenant" overwrite="true">
+            <fileset dir="../../examples/multi-tenant">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/basic-auth" overwrite="true">
+            <fileset dir="../../examples/basic-auth">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/admin-client" overwrite="true">
+            <fileset dir="../../examples/admin-client">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/themes" overwrite="true">
+            <fileset dir="../../examples/themes">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/preconfigured-demo" overwrite="true">
+            <fileset dir="../../examples/demo-template">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/unconfigured-demo" overwrite="true">
+            <fileset dir="../../examples/demo-template">
+                <exclude name="**/*.wildfly"/>
+                <exclude name="**/*.as7"/>
+                <exclude name="**/WEB-INF/jboss-web.xml"/>
+                <exclude name="**/keycloak.json"/>
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/README.md"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/fuse" overwrite="true">
+            <fileset dir="../../examples/fuse">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+            </fileset>
+        </copy>
+        <copy todir="target/examples/kerberos" overwrite="true">
+            <fileset dir="../../examples/kerberos">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+            </fileset>
+        </copy>
+        <copy file="../../examples/README.md" tofile="target/examples/README.md"/>
+        <move file="target/examples/unconfigured-demo/README.md.unconfigured" tofile="target/examples/unconfigured-demo/README.md"/>
+        <move file="target/examples/unconfigured-demo/customer-app/src/main/webapp/WEB-INF/web.xml.unconfigured" tofile="target/examples/unconfigured-demo/customer-app/src/main/webapp/WEB-INF/web.xml"/>
+        <move file="target/examples/unconfigured-demo/product-app/src/main/webapp/WEB-INF/web.xml.unconfigured" tofile="target/examples/unconfigured-demo/product-app/src/main/webapp/WEB-INF/web.xml"/>
+        <move file="target/examples/unconfigured-demo/database-service/src/main/webapp/WEB-INF/web.xml.unconfigured" tofile="target/examples/unconfigured-demo/database-service/src/main/webapp/WEB-INF/web.xml"/>
+    </target>
+</project>
diff --git a/distribution/docs-dist/pom.xml b/distribution/docs-dist/pom.xml
new file mode 100755
index 0000000000..49f076a3ce
--- /dev/null
+++ b/distribution/docs-dist/pom.xml
@@ -0,0 +1,55 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>keycloak-parent</artifactId>
+        <groupId>org.keycloak</groupId>
+        <version>1.2.0.RC1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>keycloak-docs-dist</artifactId>
+    <packaging>pom</packaging>
+    <name>Keycloak Docs Distribution</name>
+    <description/>
+
+    <dependencies>
+    </dependencies>
+    <build>
+        <finalName>keycloak-docs-${project.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>assemble</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>assembly.xml</descriptor>
+                            </descriptors>
+                            <outputDirectory>
+                                target
+                            </outputDirectory>
+                            <workDirectory>
+                                target/assembly/work
+                            </workDirectory>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/distribution/examples-dist/index.html b/distribution/docs-dist/src/index.html
similarity index 100%
rename from distribution/examples-dist/index.html
rename to distribution/docs-dist/src/index.html
diff --git a/distribution/examples-dist/assembly.xml b/distribution/examples-dist/assembly.xml
index a8c9ab2207..2d249b122f 100755
--- a/distribution/examples-dist/assembly.xml
+++ b/distribution/examples-dist/assembly.xml
@@ -4,6 +4,7 @@
     <formats>
         <format>zip</format>
     </formats>
+
     <includeBaseDirectory>true</includeBaseDirectory>
 
     <fileSets>
diff --git a/distribution/proxy-dist/assembly.xml b/distribution/proxy-dist/assembly.xml
index 98956797ea..89ba584249 100755
--- a/distribution/proxy-dist/assembly.xml
+++ b/distribution/proxy-dist/assembly.xml
@@ -4,8 +4,19 @@
     <formats>
         <format>zip</format>
     </formats>
+
     <includeBaseDirectory>true</includeBaseDirectory>
 
+    <fileSets>
+        <fileSet>
+            <directory>../../</directory>
+            <includes>
+                <include>License.html</include>
+            </includes>
+            <outputDirectory></outputDirectory>
+        </fileSet>
+    </fileSets>
+
     <dependencySets>
         <dependencySet>
             <unpack>false</unpack>
diff --git a/distribution/server-bundle-dist/assembly.xml b/distribution/server-bundle-dist/assembly.xml
index 1b4b99432e..49835001c2 100755
--- a/distribution/server-bundle-dist/assembly.xml
+++ b/distribution/server-bundle-dist/assembly.xml
@@ -6,6 +6,7 @@
         <format>tar.gz</format>
         <format>dir</format>
     </formats>
+
     <includeBaseDirectory>true</includeBaseDirectory>
 
     <dependencySets>
@@ -23,5 +24,12 @@
             <outputDirectory></outputDirectory>
             <unpack>true</unpack>
         </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.keycloak:keycloak-docs-dist:zip</include>
+            </includes>
+            <outputDirectory></outputDirectory>
+            <unpack>true</unpack>
+        </dependencySet>
     </dependencySets>
 </assembly>
diff --git a/distribution/server-bundle-dist/pom.xml b/distribution/server-bundle-dist/pom.xml
index 0328d1c0ad..dc38e481ec 100755
--- a/distribution/server-bundle-dist/pom.xml
+++ b/distribution/server-bundle-dist/pom.xml
@@ -24,6 +24,11 @@
             <artifactId>keycloak-examples-dist</artifactId>
             <type>zip</type>
         </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-docs-dist</artifactId>
+            <type>zip</type>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml
index 8764a7d3ba..b0bfb1ad37 100755
--- a/distribution/server-overlay/assembly.xml
+++ b/distribution/server-overlay/assembly.xml
@@ -12,13 +12,9 @@
             <directory>${project.build.directory}/unpacked/wildfly-${wildfly.version}</directory>
             <outputDirectory></outputDirectory>
             <includes>
-                <include>**/standalone*.xml</include>
+                <include>standalone/configuration/standalone*.xml</include>
             </includes>
         </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/unpacked/docs</directory>
-            <outputDirectory>docs</outputDirectory>
-        </fileSet>
         <fileSet>
             <directory>${project.build.directory}/unpacked/modules</directory>
             <outputDirectory>modules/system/layers/base</outputDirectory>
@@ -37,18 +33,6 @@
             </includes>
             <outputDirectory></outputDirectory>
         </fileSet>
-        <fileSet>
-            <directory>../../target/site/apidocs</directory>
-            <outputDirectory>docs/javadocs</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../../services/target/apidocs</directory>
-            <outputDirectory>docs/rest-api</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../../docbook/target/docbook/publish/en-US</directory>
-            <outputDirectory>docs/userguide</outputDirectory>
-        </fileSet>
     </fileSets>
 
     <files>
diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml
index a4ef9a04bc..97eb803a51 100755
--- a/distribution/server-overlay/pom.xml
+++ b/distribution/server-overlay/pom.xml
@@ -48,7 +48,7 @@
                                     <outputDirectory>${project.build.directory}/unpacked</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
-                            <includes>**/standalone*.xml</includes>
+                            <includes>*/standalone/configuration/standalone*.xml</includes>
                         </configuration>
                     </execution>
                     <execution>