diff --git a/distribution/demo-dist/assembly.xml b/distribution/demo-dist/assembly.xml
index c6f46645730a..f1c39c2d142a 100755
--- a/distribution/demo-dist/assembly.xml
+++ b/distribution/demo-dist/assembly.xml
@@ -39,6 +39,13 @@
                 <exclude>standalone/configuration/standalone-keycloak.xml</exclude>
             </excludes>
         </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/unpacked/keycloak-saml-wf9-adapter-${project.version}</directory>
+            <outputDirectory>keycloak</outputDirectory>
+            <excludes>
+                <exclude>standalone/configuration/standalone-keycloak.xml</exclude>
+            </excludes>
+        </fileSet>
         <fileSet>
             <directory>${project.build.directory}/unpacked/keycloak-docs-${project.version}</directory>
             <outputDirectory>docs</outputDirectory>
diff --git a/distribution/demo-dist/pom.xml b/distribution/demo-dist/pom.xml
index 7903eb86fb5a..21f2fecc6a4e 100755
--- a/distribution/demo-dist/pom.xml
+++ b/distribution/demo-dist/pom.xml
@@ -24,6 +24,11 @@
             <artifactId>keycloak-wf9-adapter-dist</artifactId>
             <type>zip</type>
         </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-saml-wf9-adapter-dist</artifactId>
+            <type>zip</type>
+        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-examples-dist</artifactId>
@@ -101,6 +106,23 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>unpack-saml-adapter</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.keycloak</groupId>
+                                    <artifactId>keycloak-saml-wf9-adapter-dist</artifactId>
+                                    <type>zip</type>
+                                    <outputDirectory>${project.build.directory}/unpacked/keycloak-saml-wf9-adapter-${project.version}</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>unpack-docs</id>
                         <phase>prepare-package</phase>
diff --git a/distribution/demo-dist/src/main/xslt/standalone.xsl b/distribution/demo-dist/src/main/xslt/standalone.xsl
index fed1ee8f35f4..106c08f304c3 100755
--- a/distribution/demo-dist/src/main/xslt/standalone.xsl
+++ b/distribution/demo-dist/src/main/xslt/standalone.xsl
@@ -18,6 +18,7 @@
             <xsl:apply-templates select="node()|@*"/>
             <extension module="org.keycloak.keycloak-server-subsystem"/>
             <extension module="org.keycloak.keycloak-adapter-subsystem"/>
+            <extension module="org.keycloak.keycloak-saml-adapter-subsystem"/>
         </xsl:copy>
     </xsl:template>
 
@@ -43,6 +44,7 @@
                 <web-context>auth</web-context>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:keycloak:1.1"/>
+            <subsystem xmlns="urn:jboss:domain:keycloak-saml:1.6"/>
         </xsl:copy>
     </xsl:template>
 
diff --git a/distribution/pom.xml b/distribution/pom.xml
index ca479390d3aa..36876bdd02f5 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -16,6 +16,7 @@
 
     <modules>
         <module>adapters</module>
+        <module>saml-adapters</module>
         <module>demo-dist</module>
         <module>docs-dist</module>
         <module>examples-dist</module>
diff --git a/distribution/saml-adapters/pom.xml b/distribution/saml-adapters/pom.xml
index 5aacc0fae0cf..8e08bdf6ad1f 100755
--- a/distribution/saml-adapters/pom.xml
+++ b/distribution/saml-adapters/pom.xml
@@ -7,24 +7,14 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <name>Adapters Distribution Parent</name>
+    <name>SAML Adapters Distribution Parent</name>
     <description/>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>keycloak-adapters-distribution-parent</artifactId>
+    <artifactId>keycloak-saml-adapters-distribution-parent</artifactId>
     <packaging>pom</packaging>
 
     <modules>
-        <module>as7-eap6-adapter</module>
-        <module>jetty81-adapter-zip</module>
-        <module>jetty91-adapter-zip</module>
-        <module>jetty92-adapter-zip</module>
-        <module>js-adapter-zip</module>
-        <module>osgi</module>
-        <module>tomcat6-adapter-zip</module>
-        <module>tomcat7-adapter-zip</module>
-        <module>tomcat8-adapter-zip</module>
-        <module>wf8-adapter</module>
         <module>wf9-adapter</module>
     </modules>
 </project>
diff --git a/distribution/saml-adapters/wf9-adapter/wf9-adapter-zip/pom.xml b/distribution/saml-adapters/wf9-adapter/wf9-adapter-zip/pom.xml
index e3ae530c454c..c6f720fca34d 100755
--- a/distribution/saml-adapters/wf9-adapter/wf9-adapter-zip/pom.xml
+++ b/distribution/saml-adapters/wf9-adapter/wf9-adapter-zip/pom.xml
@@ -10,7 +10,7 @@
 
     <artifactId>keycloak-saml-wf9-adapter-dist</artifactId>
     <packaging>pom</packaging>
-    <name>Keycloak Wildfly 9 SAML Adapter Distro</name>
+    <name>Keycloak SAML Wildfly 9 Adapter Distro</name>
     <description/>
 
     <dependencies>
diff --git a/distribution/saml-adapters/wf9-adapter/wf9-modules/build.xml b/distribution/saml-adapters/wf9-adapter/wf9-modules/build.xml
index de0eaaa59858..4816e034bc89 100755
--- a/distribution/saml-adapters/wf9-adapter/wf9-modules/build.xml
+++ b/distribution/saml-adapters/wf9-adapter/wf9-modules/build.xml
@@ -66,7 +66,7 @@
             <maven-resource group="org.keycloak" artifact="keycloak-saml-wildfly-adapter"/>
         </module-def>
 
-        <module-def name="org.keycloak.keycloak-wf9-subsystem">
+        <module-def name="org.keycloak.keycloak-saml-wf9-subsystem">
             <maven-resource group="org.keycloak" artifact="keycloak-saml-wf9-subsystem"/>
         </module-def>
 
diff --git a/distribution/saml-adapters/wf9-adapter/wf9-modules/pom.xml b/distribution/saml-adapters/wf9-adapter/wf9-modules/pom.xml
index 138930802a4c..47788bfbfdbf 100755
--- a/distribution/saml-adapters/wf9-adapter/wf9-modules/pom.xml
+++ b/distribution/saml-adapters/wf9-adapter/wf9-modules/pom.xml
@@ -14,7 +14,7 @@
 
     <artifactId>keycloak-saml-wf9-modules</artifactId>
 
-    <name>Keycloak Wildfly 9 Modules</name>
+    <name>Keycloak SAML Wildfly 9 Modules</name>
     <packaging>pom</packaging>
     <dependencies>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 5f7b5efeb5f0..17a6e3e0f860 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1107,12 +1107,24 @@
                 <version>${project.version}</version>
                 <type>zip</type>
             </dependency>
+            <dependency>
+                <groupId>org.keycloak</groupId>
+                <artifactId>keycloak-saml-wf9-modules</artifactId>
+                <version>${project.version}</version>
+                <type>zip</type>
+            </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-wf9-adapter-dist</artifactId>
                 <version>${project.version}</version>
                 <type>zip</type>
             </dependency>
+            <dependency>
+                <groupId>org.keycloak</groupId>
+                <artifactId>keycloak-saml-wf9-adapter-dist</artifactId>
+                <version>${project.version}</version>
+                <type>zip</type>
+            </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-server-overlay</artifactId>