diff --git a/packaging/jboss/modules/build.xml b/packaging/jboss/modules/build.xml
index a0761a468..1c0577d49 100644
--- a/packaging/jboss/modules/build.xml
+++ b/packaging/jboss/modules/build.xml
@@ -357,12 +357,6 @@
       <maven-resource group="org.picketlink.idm" artifact="picketlink-idm-spi"/>
     </module-def>
 
-    <!-- We need to override old version on AS 7.1.1 with newer version. TODO: remove once support for AS 7.1.1 will be dropped -->
-    <module-def name="org.picketlink" slot="gatein">
-      <maven-resource group="org.picketlink" artifact="picketlink-core" />
-      <maven-resource group="org.picketlink.distribution" artifact="picketlink-jbas7" />
-    </module-def>
-
     <module-def name="org.picocontainer">
       <maven-resource group="picocontainer" artifact="picocontainer"/>
     </module-def>
diff --git a/packaging/jboss/modules/pom.xml b/packaging/jboss/modules/pom.xml
index c6c930510..fa7bec550 100644
--- a/packaging/jboss/modules/pom.xml
+++ b/packaging/jboss/modules/pom.xml
@@ -752,14 +752,6 @@
       <groupId>org.jasig.cas.client</groupId>
       <artifactId>cas-client-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.picketlink</groupId>
-      <artifactId>picketlink-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.picketlink.distribution</groupId>
-      <artifactId>picketlink-jbas7</artifactId>
-    </dependency>
 
     <!-- GateIn OAuth -->
     <dependency>
diff --git a/packaging/jboss/modules/src/main/resources/modules/org/gatein/sso/main/module.xml b/packaging/jboss/modules/src/main/resources/modules/org/gatein/sso/main/module.xml
index 85a7a0cbf..c375cc16f 100644
--- a/packaging/jboss/modules/src/main/resources/modules/org/gatein/sso/main/module.xml
+++ b/packaging/jboss/modules/src/main/resources/modules/org/gatein/sso/main/module.xml
@@ -39,8 +39,11 @@
     <module name="org.jboss.as.web"/>
     <module name="org.jboss.logging"/>
     <module name="org.jboss.security.negotiation" export="true"/>
+    <module name="org.picketlink.common"/>
+    <module name="org.picketlink.config"/>
+    <module name="org.picketlink.federation"/>
+    <module name="org.picketlink.federation.bindings"/>
     <module name="org.picketbox"/>
-    <module name="org.picketlink" slot="gatein"/>
     <module name="javax.xml.rpc.api"/>
     <module name="javax.wsdl4j.api"/>
     <module name="javax.mail.api"/>
diff --git a/packaging/jboss/modules/src/main/resources/modules/org/picketlink/gatein/module.xml b/packaging/jboss/modules/src/main/resources/modules/org/picketlink/gatein/module.xml
deleted file mode 100644
index 1e7796090..000000000
--- a/packaging/jboss/modules/src/main/resources/modules/org/picketlink/gatein/module.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2012, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
-<module xmlns="urn:jboss:module:1.0" name="org.picketlink" slot="gatein">
-  <resources>
-    <!-- Insert resources here -->
-  </resources>
-  <dependencies>
-    <module name="javax.security.auth.message.api"/>
-    <module name="javax.security.jacc.api"/>
-    <module name="javax.transaction.api"/>
-    <module name="javax.xml.bind.api"/>
-    <module name="javax.xml.stream.api"/>
-    <module name="javax.servlet.api"/>
-    <module name="org.jboss.common-core"/>
-    <module name="org.jboss.logging"/>
-    <module name="org.jboss.as.web"/>
-    <module name="org.jboss.security.xacml"/>
-    <module name="org.picketbox"/>
-    <module name="javax.xml.ws.api"/>
-    <module name="org.apache.log4j"/>
-    <module name="org.apache.santuario.xmlsec"/>
-    <module name="javax.api"/>
-  </dependencies>
-</module>
diff --git a/pom.xml b/pom.xml
index 390536482..10e631b8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
     <org.gatein.common.version>2.2.2.Final</org.gatein.common.version>
     <org.gatein.wci.version>2.4.2.Final</org.gatein.wci.version>
     <org.gatein.pc.version>2.5.1.Final</org.gatein.pc.version>
-    <org.gatein.sso.version>1.4.2.Final</org.gatein.sso.version>
+    <org.gatein.sso.version>1.4.3.Final</org.gatein.sso.version>
     <org.picketlink.idm>1.4.5.Final</org.picketlink.idm>
     <org.gatein.wsrp.version>2.3.4.Final</org.gatein.wsrp.version>
     <org.gatein.mop.version>1.3.3.Final</org.gatein.mop.version>
diff --git a/web/portal/src/main/webapp/WEB-INF/conf/sso/saml/picketlink-idp.xml b/web/portal/src/main/webapp/WEB-INF/classes/sso/saml/picketlink-idp.xml
similarity index 94%
rename from web/portal/src/main/webapp/WEB-INF/conf/sso/saml/picketlink-idp.xml
rename to web/portal/src/main/webapp/WEB-INF/classes/sso/saml/picketlink-idp.xml
index 8ced9b192..1a8bacba4 100644
--- a/web/portal/src/main/webapp/WEB-INF/conf/sso/saml/picketlink-idp.xml
+++ b/web/portal/src/main/webapp/WEB-INF/classes/sso/saml/picketlink-idp.xml
@@ -1,6 +1,6 @@
 <PicketLink xmlns="urn:picketlink:identity-federation:config:2.1">
   <PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0"
-                 ServerEnvironment="tomcat" BindingType="POST" SupportsSignatures="true">
+                 ServerEnvironment="tomcat" BindingType="POST" SupportsSignatures="true" RoleGenerator="org.picketlink.identity.federation.core.impl.EmptyRoleGenerator">
     <IdentityURL>${gatein.sso.idp.url}</IdentityURL>
     <Trust>
       <Domains>${gatein.sso.sp.domains}</Domains>
diff --git a/web/portal/src/main/webapp/WEB-INF/conf/sso/saml/picketlink-sp.xml b/web/portal/src/main/webapp/WEB-INF/classes/sso/saml/picketlink-sp.xml
similarity index 100%
rename from web/portal/src/main/webapp/WEB-INF/conf/sso/saml/picketlink-sp.xml
rename to web/portal/src/main/webapp/WEB-INF/classes/sso/saml/picketlink-sp.xml