diff --git a/distribution/modules/build.xml b/distribution/modules/build.xml
index 3c03ca80ab..e23ff58f32 100755
--- a/distribution/modules/build.xml
+++ b/distribution/modules/build.xml
@@ -109,6 +109,10 @@
         </module-def>
         <module-def name="org.picketlink.federation.bindings">
             <maven-resource group="org.picketlink" artifact="picketlink-wildfly-common"/>
+            <maven-resource group="org.picketlink" artifact="picketlink-tomcat-common"/>
+            <maven-resource group="org.picketlink" artifact="picketlink-tomcat5-single"/>
+            <maven-resource group="org.picketlink" artifact="picketlink-jbas-common"/>
+            <maven-resource group="org.picketlink" artifact="picketlink-jbas7-single"/>
         </module-def>
         <module-def name="org.picketlink.idm">
             <maven-resource group="org.picketlink" artifact="picketlink-idm-impl"/>
diff --git a/distribution/modules/pom.xml b/distribution/modules/pom.xml
index 0ce4e17c16..2a1c7ccb85 100755
--- a/distribution/modules/pom.xml
+++ b/distribution/modules/pom.xml
@@ -81,10 +81,31 @@
             <groupId>org.picketlink</groupId>
             <artifactId>picketlink-federation</artifactId>
         </dependency>
+
+        <!-- Wildfly federation binding -->
         <dependency>
             <groupId>org.picketlink</groupId>
             <artifactId>picketlink-wildfly-common</artifactId>
         </dependency>
+
+        <!-- AS7/EAP6 federation binding -->
+        <dependency>
+            <groupId>org.picketlink</groupId>
+            <artifactId>picketlink-tomcat-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.picketlink</groupId>
+            <artifactId>picketlink-tomcat5-single</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.picketlink</groupId>
+            <artifactId>picketlink-jbas-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.picketlink</groupId>
+            <artifactId>picketlink-jbas7-single</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.picketlink</groupId>
             <artifactId>picketlink-idm-simple-schema</artifactId>
diff --git a/distribution/modules/src/main/resources/modules/org/picketlink/federation/bindings/main/module.xml b/distribution/modules/src/main/resources/modules/org/picketlink/federation/bindings/main/module.xml
index ed09b9e6fe..d726a187cd 100755
--- a/distribution/modules/src/main/resources/modules/org/picketlink/federation/bindings/main/module.xml
+++ b/distribution/modules/src/main/resources/modules/org/picketlink/federation/bindings/main/module.xml
@@ -29,7 +29,6 @@
     <module name="javax.servlet.api" />
     <module name="org.jboss.common-core" />
     <module name="org.jboss.logging" />
-    <module name="org.wildfly.extension.undertow" />
     <module name="org.jboss.security.xacml" />
     <module name="org.picketbox" />
     <module name="javax.xml.ws.api" />
@@ -43,11 +42,18 @@
     <module name="org.jboss.ws.api" />
     <module name="org.jboss.ws.spi" />
     <module name="org.apache.cxf" />
-    <module name="io.undertow.core" />
-    <module name="io.undertow.servlet" />
     <module name="org.picketlink.common" />
     <module name="org.picketlink.config" />
     <module name="org.picketlink.federation" />
+
+    <!-- Wildfly dependencies -->
+    <module name="org.wildfly.extension.undertow" optional="true" />
+    <module name="io.undertow.core" optional="true" />
+    <module name="io.undertow.servlet" optional="true" />
+
+    <!-- AS7/EAP6 dependencies -->
+    <module name="org.jboss.as.web" optional="true"/>
+    <module name="org.jboss.modules" optional="true"/>
   </dependencies>
 
 </module>
\ No newline at end of file
diff --git a/distribution/modules/src/main/resources/modules/org/picketlink/federation/main/module.xml b/distribution/modules/src/main/resources/modules/org/picketlink/federation/main/module.xml
index dac4638269..105d34b163 100755
--- a/distribution/modules/src/main/resources/modules/org/picketlink/federation/main/module.xml
+++ b/distribution/modules/src/main/resources/modules/org/picketlink/federation/main/module.xml
@@ -29,7 +29,7 @@
     <module name="javax.servlet.api" />
     <module name="org.jboss.common-core" />
     <module name="org.jboss.logging" />
-    <module name="org.jboss.as.web-common" />
+    <module name="org.jboss.as.web-common" optional="true" />
     <module name="org.jboss.security.xacml" />
     <module name="org.picketbox" />
     <module name="javax.xml.ws.api" />
diff --git a/pom.xml b/pom.xml
index 243338e1e4..8e645aa08b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -260,6 +260,26 @@
                 <artifactId>picketlink-wildfly-common</artifactId>
                 <version>${picketlink.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.picketlink</groupId>
+                <artifactId>picketlink-tomcat-common</artifactId>
+                <version>${picketlink.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.picketlink</groupId>
+                <artifactId>picketlink-tomcat5-single</artifactId>
+                <version>${picketlink.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.picketlink</groupId>
+                <artifactId>picketlink-jbas-common</artifactId>
+                <version>${picketlink.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.picketlink</groupId>
+                <artifactId>picketlink-jbas7-single</artifactId>
+                <version>${picketlink.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.picketlink</groupId>
                 <artifactId>picketlink-idm-simple-schema</artifactId>