diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml
index 857c88a6e0..d5e15f5fce 100644
--- a/openjpa-kernel/pom.xml
+++ b/openjpa-kernel/pom.xml
@@ -43,7 +43,9 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <artifactId>geronimo-jms_2.0_spec</artifactId>
+            <version>1.0-alpha-2</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml
index 2d5e72a29b..df2da7d26c 100644
--- a/openjpa-persistence-jdbc/pom.xml
+++ b/openjpa-persistence-jdbc/pom.xml
@@ -84,6 +84,12 @@
             <artifactId>commons-collections4</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_2.0_spec</artifactId>
+            <version>1.0-alpha-2</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>jakarta-regexp</groupId>
             <artifactId>jakarta-regexp</artifactId>
diff --git a/openjpa-project/NOTICE b/openjpa-project/NOTICE
index 85dae47b22..662dc8b2dc 100644
--- a/openjpa-project/NOTICE
+++ b/openjpa-project/NOTICE
@@ -13,7 +13,7 @@ The OpenJPA binary assembly and openjpa-all includes software developed by the:
     Apache Commons Pool project
     Apache Derby project
     Apache Geronimo project
-        Java EE Specs - JMS 1.1, JTA 1.1, Bean Validation 1.0 and JPA 2.0
+        Java EE Specs - JMS 2.0, JTA 1.1, Bean Validation 1.0 and JPA 2.0
     Apache Incubtor - Bean Validation project
     SERP project
 
diff --git a/openjpa-project/assembly.xml b/openjpa-project/assembly.xml
index 32f3c68e01..7560d71956 100644
--- a/openjpa-project/assembly.xml
+++ b/openjpa-project/assembly.xml
@@ -140,7 +140,7 @@
 
                 <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-jpa_2.1_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-jms_2.0_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
                 <include>org.apache.bval:org.apache.bval.bundle</include>
                 <include>org.apache.xbean:xbean-asm7-shaded</include>
diff --git a/openjpa-project/bin-assembly.xml b/openjpa-project/bin-assembly.xml
index 927bc5a447..b77a272ff8 100644
--- a/openjpa-project/bin-assembly.xml
+++ b/openjpa-project/bin-assembly.xml
@@ -79,7 +79,7 @@
 
                 <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-jpa_2.1_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-jms_2.0_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
                 <include>org.apache.bval:org.apache.bval.bundle</include>
                 <include>org.apache.xbean:xbean-asm7-shaded</include>
diff --git a/openjpa-project/src/doc/manual/openjpa_legal.xml b/openjpa-project/src/doc/manual/openjpa_legal.xml
index 8aa8aef6c5..52725023fc 100644
--- a/openjpa-project/src/doc/manual/openjpa_legal.xml
+++ b/openjpa-project/src/doc/manual/openjpa_legal.xml
@@ -74,7 +74,7 @@ The openjpa-all aggregate JAR includes software developed by the:
     Apache Commons Pool project
                 </para></listitem>
                 <listitem><para>
-    Apache Geronimo project (JMS 1.1, JTA 1.1 and JPA 2.0 spec APIs)
+    Apache Geronimo project (JMS 2.0, JTA 1.1 and JPA 2.0 spec APIs)
                 </para></listitem>
                 <listitem><para>
     JCP JSR-317 JPA 2.0 schemas
diff --git a/pom.xml b/pom.xml
index c41a274e9c..7d41dbb898 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1519,8 +1519,9 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jms_1.1_spec</artifactId>
-                <version>1.1.1</version>
+                <artifactId>geronimo-jms_2.0_spec</artifactId>
+                <version>1.0-alpha-2</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>