diff --git a/activemq-jms-client/pom.xml b/activemq-jms-client/pom.xml
index d6eb8100f0..32fc2e2595 100644
--- a/activemq-jms-client/pom.xml
+++ b/activemq-jms-client/pom.xml
@@ -27,8 +27,8 @@
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.jms</groupId>
-         <artifactId>jboss-jms-api_2.0_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>javax.inject</groupId>
diff --git a/activemq-jms-server/pom.xml b/activemq-jms-server/pom.xml
index 246dea3ff8..a3e495e626 100644
--- a/activemq-jms-server/pom.xml
+++ b/activemq-jms-server/pom.xml
@@ -42,8 +42,8 @@
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.jms</groupId>
-         <artifactId>jboss-jms-api_2.0_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>org.apache.geronimo.specs</groupId>
diff --git a/activemq-protocols/activemq-amqp-protocol/pom.xml b/activemq-protocols/activemq-amqp-protocol/pom.xml
index ebd5ebe88f..f8bb572dba 100644
--- a/activemq-protocols/activemq-amqp-protocol/pom.xml
+++ b/activemq-protocols/activemq-amqp-protocol/pom.xml
@@ -55,12 +55,9 @@
          <groupId>org.apache.qpid</groupId>
          <artifactId>proton-jms</artifactId>
       </dependency>
-
-
-
       <dependency>
-         <groupId>org.jboss.spec.javax.jms</groupId>
-         <artifactId>jboss-jms-api_2.0_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-jms_2.0_spec</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
diff --git a/activemq-protocols/activemq-proton-plug/pom.xml b/activemq-protocols/activemq-proton-plug/pom.xml
index 84c56d8eb3..b0e849cc00 100644
--- a/activemq-protocols/activemq-proton-plug/pom.xml
+++ b/activemq-protocols/activemq-proton-plug/pom.xml
@@ -63,8 +63,8 @@
 
 
       <dependency>
-         <groupId>org.jboss.spec.javax.jms</groupId>
-         <artifactId>jboss-jms-api_2.0_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-jms_2.0_spec</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
diff --git a/activemq-rest/pom.xml b/activemq-rest/pom.xml
index 5ffab7f067..28ad559677 100644
--- a/activemq-rest/pom.xml
+++ b/activemq-rest/pom.xml
@@ -75,8 +75,8 @@
          <version>${activemq.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.jms</groupId>
-         <artifactId>jboss-jms-api_2.0_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index 4dadcf62cd..3a60dbc2e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
+   <parent>
+      <groupId>org.apache</groupId>
+      <artifactId>apache</artifactId>
+      <version>16</version>
+   </parent>
    <groupId>org.apache.activemq</groupId>
    <artifactId>activemq-pom</artifactId>
    <packaging>pom</packaging>
@@ -73,6 +78,7 @@
       <activemq.basedir>${project.basedir}</activemq.basedir>
       <skipLicenseCheck>false</skipLicenseCheck>
       <skipStyleCheck>false</skipStyleCheck>
+      <geronimo.jms.2.spec.version>1.0.0-SNAPSHOT</geronimo.jms.2.spec.version>
    </properties>
 
    <scm>
@@ -191,9 +197,9 @@
 
          <!-- needed to compile JMS-->
          <dependency>
-            <groupId>org.jboss.spec.javax.jms</groupId>
-            <artifactId>jboss-jms-api_2.0_spec</artifactId>
-            <version>1.0.0.Final</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_2.0_spec</artifactId>
+            <version>${geronimo.jms.2.spec.version}</version>
          </dependency>
 
          <!-- needed to provide JMS injection-->
diff --git a/tests/byteman-tests/pom.xml b/tests/byteman-tests/pom.xml
index 0388dc8225..953b63af64 100644
--- a/tests/byteman-tests/pom.xml
+++ b/tests/byteman-tests/pom.xml
@@ -136,8 +136,8 @@
          <artifactId>geronimo-jaspi</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.jms</groupId>
-         <artifactId>jboss-jms-api_2.0_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>
diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml
index 03662a6a13..bec766f841 100644
--- a/tests/jms-tests/pom.xml
+++ b/tests/jms-tests/pom.xml
@@ -105,8 +105,8 @@
          <artifactId>geronimo-jaspi</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.jms</groupId>
-         <artifactId>jboss-jms-api_2.0_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>
diff --git a/tests/joram-tests/pom.xml b/tests/joram-tests/pom.xml
index fe78bbc320..26101c66df 100644
--- a/tests/joram-tests/pom.xml
+++ b/tests/joram-tests/pom.xml
@@ -84,8 +84,8 @@
          <artifactId>geronimo-jaspi</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.jms</groupId>
-         <artifactId>jboss-jms-api_2.0_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
    </dependencies>
 
diff --git a/tests/performance-tests/pom.xml b/tests/performance-tests/pom.xml
index 224694fcd8..a093c3ae0c 100644
--- a/tests/performance-tests/pom.xml
+++ b/tests/performance-tests/pom.xml
@@ -98,8 +98,8 @@
          <artifactId>geronimo-jaspi</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.jms</groupId>
-         <artifactId>jboss-jms-api_2.0_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
    </dependencies>
 
diff --git a/tests/soak-tests/pom.xml b/tests/soak-tests/pom.xml
index 7846310fcf..9dcb03d6d1 100644
--- a/tests/soak-tests/pom.xml
+++ b/tests/soak-tests/pom.xml
@@ -117,8 +117,8 @@
          <artifactId>geronimo-jaspi</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.jms</groupId>
-         <artifactId>jboss-jms-api_2.0_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
    </dependencies>
 
diff --git a/tests/stress-tests/pom.xml b/tests/stress-tests/pom.xml
index 9d212c02f0..9ba2b55727 100644
--- a/tests/stress-tests/pom.xml
+++ b/tests/stress-tests/pom.xml
@@ -117,8 +117,8 @@
          <artifactId>geronimo-jaspi</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.jms</groupId>
-         <artifactId>jboss-jms-api_2.0_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
    </dependencies>
 
diff --git a/tests/timing-tests/pom.xml b/tests/timing-tests/pom.xml
index b83d46ae08..120404fdab 100644
--- a/tests/timing-tests/pom.xml
+++ b/tests/timing-tests/pom.xml
@@ -95,8 +95,8 @@
          <artifactId>geronimo-jaspi</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.jms</groupId>
-         <artifactId>jboss-jms-api_2.0_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
    </dependencies>