diff --git a/parent/pom.xml b/parent/pom.xml
index 51414783..c0bf6983 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -617,15 +617,15 @@
                 <scope>provided</scope>
             </dependency>
             <dependency>
-                <groupId>javax.jms</groupId>
-                <artifactId>jms</artifactId>
-                <version>1.1</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jms_1.1_spec</artifactId>
+                <version>1.1.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
-                <groupId>javax.ejb</groupId>
-                <artifactId>ejb</artifactId>
-                <version>2.1</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-ejb_2.1_spec</artifactId>
+                <version>1.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -700,10 +700,6 @@
                         <groupId>javax.mail</groupId>
                         <artifactId>mail</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>javax.jms</groupId>
-                        <artifactId>jms</artifactId>
-                    </exclusion>
                     <exclusion>
                         <groupId>com.sun.jdmk</groupId>
                         <artifactId>jmxtools</artifactId>
diff --git a/samples/airline/client/jms/pom.xml b/samples/airline/client/jms/pom.xml
index 044f3b84..6ad26509 100644
--- a/samples/airline/client/jms/pom.xml
+++ b/samples/airline/client/jms/pom.xml
@@ -45,8 +45,8 @@
     </build>    
     <dependencies>
         <dependency>
-            <groupId>javax.jms</groupId>
-            <artifactId>jms</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/samples/airline/server/pom.xml b/samples/airline/server/pom.xml
index 82aae0d5..f113fd25 100644
--- a/samples/airline/server/pom.xml
+++ b/samples/airline/server/pom.xml
@@ -195,8 +195,8 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>javax.jms</groupId>
-            <artifactId>jms</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
             <scope>runtime</scope>
         </dependency>
         <!-- O/R Mapping dependencies -->
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index 5a37f200..c746afd8 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -62,8 +62,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.jms</groupId>
-            <artifactId>jms</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/support/pom.xml b/support/pom.xml
index e7c5bfee..733f6380 100644
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -75,13 +75,13 @@
         </dependency>
         <!-- Java EE dependencies -->
         <dependency>
-            <groupId>javax.jms</groupId>
-            <artifactId>jms</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>javax.ejb</groupId>
-            <artifactId>ejb</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>