diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index bbd0381ba..8d1cb9635 100644
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -30,11 +30,11 @@
   <name>Archiva Base :: Configuration</name>
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.redback.components.registry</groupId>
+      <groupId>org.apache.archiva.redback.components</groupId>
       <artifactId>spring-registry-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback.components.registry</groupId>
+      <groupId>org.apache.archiva.redback.components</groupId>
       <artifactId>spring-registry-commons</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
index 79367598a..b5b4c030e 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
@@ -50,7 +50,7 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback.components.registry</groupId>
+      <groupId>org.apache.archiva.redback.components</groupId>
       <artifactId>spring-registry-api</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
index 455eb2034..33c019234 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
@@ -54,7 +54,7 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback.components.registry</groupId>
+      <groupId>org.apache.archiva.redback.components</groupId>
       <artifactId>spring-registry-api</artifactId>
     </dependency>
   </dependencies>
diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml
index 7b7c1ca03..146708b95 100644
--- a/archiva-modules/archiva-base/archiva-proxy/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml
@@ -97,7 +97,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback.components.registry</groupId>
+      <groupId>org.apache.archiva.redback.components</groupId>
       <artifactId>spring-registry-commons</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 182696aa8..aa0ac1a50 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -432,11 +432,11 @@
       <version>${struts.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback.components.registry</groupId>
+      <groupId>org.apache.archiva.redback.components</groupId>
       <artifactId>spring-registry-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback.components.registry</groupId>
+      <groupId>org.apache.archiva.redback.components</groupId>
       <artifactId>spring-registry-commons</artifactId>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 0f317b24d..17185b25f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
     <redback.version>2.0-SNAPSHOT</redback.version>
     <redback.cache.version>2.0-SNAPSHOT</redback.cache.version>
     <redback.quartz.version>2.0-SNAPSHOT</redback.quartz.version>
-    <redback.registry.version>1.0</redback.registry.version>
+    <redback.registry.version>2.0-SNAPSHOT</redback.registry.version>
     <redback.spring-utils.version>1.0</redback.spring-utils.version>
     <redback.taskqueue.version>1.0</redback.taskqueue.version>
     <slf4j.version>1.6.4</slf4j.version>
@@ -1067,12 +1067,12 @@
       <!-- redback components -->
 
       <dependency>
-        <groupId>org.codehaus.redback.components.registry</groupId>
+        <groupId>org.apache.archiva.redback.components</groupId>
         <artifactId>spring-registry-api</artifactId>
         <version>${redback.registry.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.redback.components.registry</groupId>
+        <groupId>org.apache.archiva.redback.components</groupId>
         <artifactId>spring-registry-commons</artifactId>
         <version>${redback.registry.version}</version>
         <exclusions>