diff --git a/docbook/pom.xml b/docbook/pom.xml
index 409b4afd4f..29d73eaa58 100755
--- a/docbook/pom.xml
+++ b/docbook/pom.xml
@@ -110,6 +110,10 @@
                             <name>project.version</name>
                             <value>${project.version}</value>
                         </injection>
+                        <injection>
+                            <name>picketlink.version</name>
+                            <value>${picketlink.version}</value>
+                        </injection>
                     </injections>
                     <options>
                         <xmlTransformerType>saxon</xmlTransformerType>
diff --git a/docbook/reference/en/en-US/modules/server-installation.xml b/docbook/reference/en/en-US/modules/server-installation.xml
index d0c7b115e5..9b4413af09 100755
--- a/docbook/reference/en/en-US/modules/server-installation.xml
+++ b/docbook/reference/en/en-US/modules/server-installation.xml
@@ -120,6 +120,9 @@ keycloak-war-dist-all-&project.version;/
             Password: <emphasis>admin</emphasis>. Keycloak will then prompt you to
             enter in a new password.
         </para>
+        <para>
+            If you have Keycloak on JBoss AS 7.1.1 or EAP 6.2 make sure to follow <link linkend="as7-specifics">these steps</link>.
+        </para>
     </section>
     <section>
         <title id="configure-server">Configuring the Server</title>
@@ -389,20 +392,59 @@ keycloak-war-dist-all-&project.version;/
             </para>
         </section>
 
-        <section>
-            <title>AS7/EAP6.x Logging</title>
+        <section id="as7-specifics">
+            <title>AS7/EAP6.x specifics</title>
             <para>
-                Accessing the admin console will get these annoying log messages:
+                If you have Keycloak on JBoss AS 7.1.1 or JBoss EAP 6.2, you need to do few other things in order to have Keycloak up and running. This includes:
+                <orderedlist>
+                    <listitem>
+                        <para>
+                            Remove or comment the element from file <literal>KEYCLOAK_HOME/standalone/deployments/auth-server.war/WEB-INF/jboss-deployment-structure.xml</literal>.
+<programlisting><![CDATA[
+<exclude-subsystems>
+    <subsystem name="webservices"/>
+</exclude-subsystems>
+]]></programlisting>
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>
+                            Then either:
+                        </para>
+                        <para>
+                            <itemizedlist>
+                                <listitem>
+                                    <para>
+                                        Disable webservices extension and subsystem by remove (or comment) both in <literal>KEYCLOAK_HOME/standalone/configuration/standalone.xml</literal>.
+                                    </para>
+                                </listitem>
+                                <listitem>
+                                    <para>
+                                        If you want to use webservices subsystem, the alternative is to remove 2 JAR files
+                                        <literal>KEYCLOAK_HOME/standalone/deployments/auth-server.war/WEB-INF/lib/keycloak-saml-protocol-&project.version;.jar</literal>
+                                        and <literal>KEYCLOAK_HOME/standalone/deployments/auth-server.war/WEB-INF/lib/picketlink-federation-&picketlink.version;.jar</literal>
+                                        but note that <link linkend="saml">SAML</link> won't work.
+                                    </para>
+                                </listitem>
+                            </itemizedlist>
+                        </para>
+                    </listitem>
+                </orderedlist>
             </para>
+            <section>
+                <title>AS7/EAP6.x Logging</title>
+                <para>
+                    Accessing the admin console will get these annoying log messages:
+                </para>
 <programlisting>
     WARN  [org.jboss.resteasy.core.ResourceLocator] (http-/127.0.0.1:8080-3)
                 Field providers of subresource xxx will not be injected according to spec
 
 </programlisting>
 
-            <para>
-                These can be ignored by editing standalone.xml of your jboss installation:
-            </para>
+                <para>
+                    These can be ignored by editing standalone.xml of your jboss installation:
+                </para>
 <programlisting>
 <![CDATA[
     <logger category="org.jboss.resteasy.core.ResourceLocator">
@@ -410,7 +452,9 @@ keycloak-war-dist-all-&project.version;/
     </logger>
 ]]>
 </programlisting>
+            </section>
         </section>
+
         <section id="ssl_modes">
             <title>SSL/HTTPS Requirement/Modes</title>
             <warning>