diff --git a/jaxrs/jboss-modules/build-wf8.xml b/jaxrs/jboss-modules/build-wf8.xml
index 58314be..70b4b98 100755
--- a/jaxrs/jboss-modules/build-wf8.xml
+++ b/jaxrs/jboss-modules/build-wf8.xml
@@ -53,8 +53,11 @@
           -->
 
         <module-def name="org.bouncycastle">
-            <maven-resource group="org.bouncycastle" artifact="bcprov-jdk16"/>
-            <maven-resource group="org.bouncycastle" artifact="bcmail-jdk16"/>
+            <maven-resource group="org.bouncycastle" artifact="bcprov-jdk15on"/>
+            <maven-resource group="org.bouncycastle" artifact="bcmail-jdk15on"/>
+            <maven-resource group="org.bouncycastle" artifact="bcpkix-jdk15on"/>
         </module-def>
 
         <module-def name="org.codehaus.jackson.jackson-core-asl">
diff --git a/jaxrs/jboss-modules/build.xml b/jaxrs/jboss-modules/build.xml
index 810a002..eea8358 100755
--- a/jaxrs/jboss-modules/build.xml
+++ b/jaxrs/jboss-modules/build.xml
@@ -53,8 +53,11 @@
           -->
 
         <module-def name="org.bouncycastle">
-            <maven-resource group="org.bouncycastle" artifact="bcprov-jdk16"/>
-            <maven-resource group="org.bouncycastle" artifact="bcmail-jdk16"/>
+            <maven-resource group="org.bouncycastle" artifact="bcprov-jdk15on"/>
+            <maven-resource group="org.bouncycastle" artifact="bcmail-jdk15on"/>
         </module-def>
 
         <module-def name="org.codehaus.jackson.jackson-core-asl">
diff --git a/jaxrs/jboss-modules/src/main/resources/modules/org/bouncycastle/main/module.xml b/jaxrs/jboss-modules/src/main/resources/modules/org/bouncycastle/main/module.xml
index d0ec17b..8f5b63e 100644
--- a/jaxrs/jboss-modules/src/main/resources/modules/org/bouncycastle/main/module.xml
+++ b/jaxrs/jboss-modules/src/main/resources/modules/org/bouncycastle/main/module.xml
@@ -21,13 +21,18 @@
   ~ 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.1" name="org.bouncycastle">
     <resources>
+        <resource-root path="bcprov-jdk15on-1.52.jar"/>
+        <resource-root path="bcmail-jdk15on-1.52.jar"/>
+        <resource-root path="bcpkix-jdk15on-1.52.jar"/>
         <!-- Insert resources here -->
     </resources>
     <dependencies>
         <module name="javax.api"/>
+        <module name="javax.mail.api" optional="true"/>
+        <module name="javax.activation.api" optional="true"/>
     </dependencies>
 
 </module>
+
diff --git a/jaxrs/jboss-modules/src/main/resources/modules/org/jboss/resteasy/resteasy-crypto/main/module.xml b/jaxrs/jboss-modules/src/main/resources/modules/org/jboss/resteasy/resteasy-crypto/main/module.xml
index 87d8c8e..46c0996 100644
--- a/jaxrs/jboss-modules/src/main/resources/modules/org/jboss/resteasy/resteasy-crypto/main/module.xml
+++ b/jaxrs/jboss-modules/src/main/resources/modules/org/jboss/resteasy/resteasy-crypto/main/module.xml
@@ -35,5 +35,6 @@
         <module name="javax.ws.rs.api"/>
         <module name="org.jboss.resteasy.resteasy-jaxrs"/>
         <module name="org.bouncycastle" export="true"/>
+        <module name="javax.activation.api"/>
     </dependencies>
 </module>