diff --git a/activecluster/project.xml b/activecluster/project.xml
index bc9f745864..3d21b6f6ab 100644
--- a/activecluster/project.xml
+++ b/activecluster/project.xml
@@ -64,19 +64,24 @@
       <url>http://jakarta.apache.org/commons/logging/</url>
     </dependency>
    
-    <dependency>
-      <id>geronimo-spec+jms</id>
-      <version>1.1-rc4</version>
-    </dependency>
-    <dependency>
-      <id>geronimo-spec+jta</id>
-      <version>1.0.1B-rc4</version>
-    </dependency>
-    <dependency>
-      <id>geronimo-spec+j2ee-management</id>
-      <version>1.0-rc4</version>
-    </dependency>
-
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jms_1.1_spec</artifactId>
+        <version>1.0</version>
+      </dependency>
+    
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+        <version>1.0</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+        <version>1.0</version>
+      </dependency>
+  
     <!-- default JMS provider used for implementation -->
     <dependency>
       <groupId>${pom.groupId}</groupId>
diff --git a/activemq-optional/project.xml b/activemq-optional/project.xml
index 43a3ce2c1e..3548a2a4bc 100755
--- a/activemq-optional/project.xml
+++ b/activemq-optional/project.xml
@@ -60,12 +60,11 @@
     </dependency>
 
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-j2ee-connector</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       <version>${geronimo_spec_j2ee_connector_version}</version>
     </dependency>
-
-
+    
     <dependency>
       <id>springframework</id>
       <artifactId>spring</artifactId>
diff --git a/activemq-ra/project.xml b/activemq-ra/project.xml
index 5a89ecf2d8..182737e9af 100755
--- a/activemq-ra/project.xml
+++ b/activemq-ra/project.xml
@@ -40,15 +40,15 @@
   <dependencies>
 
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-j2ee-connector</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       <version>${geronimo_spec_j2ee_connector_version}</version>
       <properties>
         <rar.bundle>false</rar.bundle>
         <lib>true</lib>
       </properties>
     </dependency>
-
+    
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
diff --git a/activemq-systest/project.xml b/activemq-systest/project.xml
index 94060c1f9a..08a992cb8a 100755
--- a/activemq-systest/project.xml
+++ b/activemq-systest/project.xml
@@ -45,8 +45,8 @@
   <dependencies>
 
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-j2ee-connector</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       <version>${geronimo_spec_j2ee_connector_version}</version>
       <properties>
         <rar.bundle>false</rar.bundle>
diff --git a/activemq-web/project.xml b/activemq-web/project.xml
index 427b02fcda..0ac3de0a6e 100755
--- a/activemq-web/project.xml
+++ b/activemq-web/project.xml
@@ -95,8 +95,8 @@
 
     <!-- optional used for in-web container testing -->
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-jsp</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jsp_2.0_spec</artifactId>
       <version>${geronimo_spec_jsp_version}</version>
       <properties>
         <war.bundle>false</war.bundle>
diff --git a/assembly/project.xml b/assembly/project.xml
index eaadc9b3a3..a02025200b 100755
--- a/assembly/project.xml
+++ b/assembly/project.xml
@@ -261,8 +261,8 @@
 
     <!-- to create a web server to test out the web stuff -->
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-jsp</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jsp_2.0_spec</artifactId>
       <version>${geronimo_spec_jsp_version}</version>
       <properties>
         <war.bundle>false</war.bundle>
@@ -271,8 +271,8 @@
     </dependency>
 
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-j2ee-connector</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       <version>${geronimo_spec_j2ee_connector_version}</version>
       <properties>
         <optional>true</optional>
diff --git a/etc/project.properties b/etc/project.properties
index 0474e6d7a7..af8daf4254 100755
--- a/etc/project.properties
+++ b/etc/project.properties
@@ -73,7 +73,7 @@ maven.repo.apache.scp.executable=scp
 
 <!-- used by all modules -->
 ant_version=1.6
-geronimo_spec_j2ee_version=1.4-rc4
+geronimo_spec_j2ee_version=1.0
 concurrent_version=1.3.4
 commons_logging_version=1.0.3
 log4j_version=1.2.12
@@ -177,13 +177,13 @@ commons_jelly_tags_velocity_version=SNAPSHOT
 velocity_version=1.4-rc1
 
 <!-- j2ee API fragment jars, used for WARs -->
-geronimo_spec_jms_version=1.1-rc4
-geronimo_spec_jta_version=1.0.1B-rc4
-geronimo_spec_j2ee_management_version=1.0-rc4
-geronimo_spec_j2ee_jacc_version=1.0-rc4
-geronimo_spec_ejb_version=2.1-rc4
-geronimo_spec_j2ee_connector_version=1.5-rc4
-geronimo_spec_jsp_version=2.0-rc4
+geronimo_spec_jms_version=1.0
+geronimo_spec_jta_version=1.0
+geronimo_spec_j2ee_management_version=1.0
+geronimo_spec_j2ee_jacc_version=1.0
+geronimo_spec_ejb_version=1.0
+geronimo_spec_j2ee_connector_version=1.0
+geronimo_spec_jsp_version=1.0
 
 <!-- used by activemq-ws -->
 activesoap_version=1.0-SNAPSHOT
diff --git a/etc/project.xml b/etc/project.xml
index eb556a9c2a..db5518bd9b 100755
--- a/etc/project.xml
+++ b/etc/project.xml
@@ -328,24 +328,9 @@
       </properties>
     </dependency>
 
-    <!--
-
-    lets switch to using the specific J2EE jars we need
-
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-j2ee</artifactId>
-      <version>${geronimo_spec_version}</version>
-      <properties>
-        <rar.bundle>false</rar.bundle>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    -->
-
-    <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-jms</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
       <version>${geronimo_spec_jms_version}</version>
       <properties>
         <activemq.module>true</activemq.module>
@@ -357,8 +342,8 @@
     </dependency>
 
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-jta</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
       <version>${geronimo_spec_jta_version}</version>
       <properties>
         <lib>false</lib>
@@ -368,8 +353,8 @@
     </dependency>
 
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-j2ee-management</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
       <version>${geronimo_spec_j2ee_management_version}</version>
       <properties>
         <activemq.module>true</activemq.module>
@@ -380,8 +365,8 @@
     </dependency>
 
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-j2ee-jacc</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
       <version>${geronimo_spec_j2ee_jacc_version}</version>
       <properties>
         <rar.bundle>false</rar.bundle>
diff --git a/jmeter/project.xml b/jmeter/project.xml
index acddf96ed0..161386c80c 100755
--- a/jmeter/project.xml
+++ b/jmeter/project.xml
@@ -312,8 +312,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
             <properties>
 	        <jmeter.module>true</jmeter.module>
diff --git a/pom.xml b/pom.xml
index b81c662fa6..f416ff6e1d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -129,39 +129,39 @@
       </dependency>
   
       <dependency>
-        <groupId>geronimo-spec</groupId>
-        <artifactId>geronimo-spec-jms</artifactId>
-        <version>1.1-rc4</version>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jms_1.1_spec</artifactId>
+        <version>1.0</version>
       </dependency>
 
       <dependency>
-        <groupId>geronimo-spec</groupId>
-        <artifactId>geronimo-spec-jta</artifactId>
-        <version>1.0.1B-rc4</version>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+        <version>1.0</version>
       </dependency>
 
       <dependency>
-        <groupId>geronimo-spec</groupId>
-        <artifactId>geronimo-spec-j2ee-management</artifactId>
-        <version>1.0-rc4</version>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+        <version>1.0</version>
       </dependency>
 
       <dependency>
-        <groupId>geronimo-spec</groupId>
-        <artifactId>geronimo-spec-j2ee-jacc</artifactId>
-        <version>1.0-rc4</version>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+        <version>1.0</version>
       </dependency>
 
       <dependency>
-        <groupId>geronimo-spec</groupId>
-        <artifactId>geronimo-spec-j2ee-connector</artifactId>
-        <version>1.5-rc4</version>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        <version>1.0</version>
       </dependency>
 
       <dependency>
-        <groupId>geronimo-spec</groupId>
-        <artifactId>geronimo-spec-jsp</artifactId>
-        <version>2.0-rc4</version>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jsp_2.0_spec</artifactId>
+        <version>1.0</version>
       </dependency>
 
       
diff --git a/systest/itests/client/project.xml b/systest/itests/client/project.xml
index bb2d73b2e6..891480b91c 100755
--- a/systest/itests/client/project.xml
+++ b/systest/itests/client/project.xml
@@ -34,8 +34,8 @@
        </dependency>
 
        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-ejb</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
             <version>${geronimo_spec_ejb_version}</version>
        </dependency>
         <dependency>
diff --git a/systest/itests/ejb/project.xml b/systest/itests/ejb/project.xml
index 6c698ad097..3e4fb627fb 100755
--- a/systest/itests/ejb/project.xml
+++ b/systest/itests/ejb/project.xml
@@ -21,8 +21,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-ejb</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-ejb_2.1_spec</artifactId>
       <version>${geronimo_spec_ejb_version}</version>
       <properties>
         <rar.bundle>false</rar.bundle>
diff --git a/systest/jboss-test/project.xml b/systest/jboss-test/project.xml
index 008fbb2493..bcbadc602b 100644
--- a/systest/jboss-test/project.xml
+++ b/systest/jboss-test/project.xml
@@ -29,9 +29,9 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
-            <version>1.4-rc4</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+            <version>1.0</version>
             <url>http://geronimo.apache.org/</url>
         </dependency>
 
diff --git a/systest/usecases/project.xml b/systest/usecases/project.xml
index ed6cf025b3..ef3a2ab5f5 100644
--- a/systest/usecases/project.xml
+++ b/systest/usecases/project.xml
@@ -15,8 +15,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-servlet</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.4_spec</artifactId>
       <version>${geronimo_spec_servlet_version}</version>
       <properties>
         <war.bundle>false</war.bundle>