diff --git a/sandbox/openid/pom.xml b/openid/pom.xml
similarity index 54%
rename from sandbox/openid/pom.xml
rename to openid/pom.xml
index e892198a88..bd2b8c333f 100644
--- a/sandbox/openid/pom.xml
+++ b/openid/pom.xml
@@ -1,30 +1,22 @@
 <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.springframework.security</groupId>
-        <artifactId>spring-security-sandbox</artifactId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
+  <parent>
+    <groupId>org.springframework.security</groupId>
+    <artifactId>spring-security-parent</artifactId>
+    <version>2.0-SNAPSHOT</version>
+  </parent>
     <artifactId>spring-security-openid</artifactId>
-    <name>Spring Security System - OpenID support</name>
+    <name>Spring Security - OpenID support</name>
     <description>Spring Security - Support for OpenID</description>
-    <version>0.1-SNAPSHOT</version>
-
-<!--
-    <repositories>
-        <repository>
-            <id>AcegiMaven</id>
-            <name>Acegi 3rd party repository</name>
-            <url>http://acegisecurity.sourceforge.net/maven</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-    </repositories>
--->
+    <version>2.0-SNAPSHOT</version>
 
     <dependencies>
+    		<dependency>
+          <groupId>org.springframework.security</groupId>
+          <artifactId>spring-security-core</artifactId>
+          <version>${project.version}</version>
+    		</dependency>
         <dependency>
           <groupId>org.springframework</groupId>
           <artifactId>spring-core</artifactId>
@@ -45,15 +37,6 @@
             <artifactId>openid4java</artifactId>
             <version>0.9.3</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.4_spec</artifactId>
-            <version>1.1.1</version>
-            <scope>compile</scope>
-            <optional>true</optional>
-        </dependency>
-
     </dependencies>
 
 </project>
diff --git a/sandbox/openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java b/openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java
similarity index 95%
rename from sandbox/openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java
rename to openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java
index d7d1125a41..df42343b3a 100644
--- a/sandbox/openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java
+++ b/openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java
@@ -21,7 +21,7 @@ import org.springframework.security.AuthenticationException;
  * Indicates that OpenID authentication was cancelled
  *
  * @author Robin Bramley, Opsera Ltd
- * @version $Id:$
+ * @version $Id$
  */
 public class AuthenticationCancelledException extends AuthenticationException {
     //~ Constructors ===================================================================================================
diff --git a/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationProvider.java b/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationProvider.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationProvider.java
rename to openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationProvider.java
diff --git a/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationStatus.java b/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationStatus.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationStatus.java
rename to openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationStatus.java
diff --git a/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationToken.java b/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationToken.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationToken.java
rename to openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationToken.java
diff --git a/sandbox/openid/src/main/java/org/springframework/security/providers/openid/package.html b/openid/src/main/java/org/springframework/security/providers/openid/package.html
similarity index 100%
rename from sandbox/openid/src/main/java/org/springframework/security/providers/openid/package.html
rename to openid/src/main/java/org/springframework/security/providers/openid/package.html
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConstants.java b/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConstants.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConstants.java
rename to openid/src/main/java/org/springframework/security/ui/openid/OpenIDConstants.java
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumer.java b/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumer.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumer.java
rename to openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumer.java
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumerException.java b/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumerException.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumerException.java
rename to openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumerException.java
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilter.java b/openid/src/main/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilter.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilter.java
rename to openid/src/main/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilter.java
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationProcessingFilter.java b/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationProcessingFilter.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationProcessingFilter.java
rename to openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationProcessingFilter.java
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationRequiredException.java b/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationRequiredException.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationRequiredException.java
rename to openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationRequiredException.java
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/OpenId4JavaConsumer.java b/openid/src/main/java/org/springframework/security/ui/openid/consumers/OpenId4JavaConsumer.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/OpenId4JavaConsumer.java
rename to openid/src/main/java/org/springframework/security/ui/openid/consumers/OpenId4JavaConsumer.java
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/package.html b/openid/src/main/java/org/springframework/security/ui/openid/consumers/package.html
similarity index 100%
rename from sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/package.html
rename to openid/src/main/java/org/springframework/security/ui/openid/consumers/package.html
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/package.html b/openid/src/main/java/org/springframework/security/ui/openid/package.html
similarity index 100%
rename from sandbox/openid/src/main/java/org/springframework/security/ui/openid/package.html
rename to openid/src/main/java/org/springframework/security/ui/openid/package.html
diff --git a/sandbox/openid/src/test/java/org/springframework/security/providers/openid/MockAuthoritiesPopulator.java b/openid/src/test/java/org/springframework/security/providers/openid/MockAuthoritiesPopulator.java
similarity index 100%
rename from sandbox/openid/src/test/java/org/springframework/security/providers/openid/MockAuthoritiesPopulator.java
rename to openid/src/test/java/org/springframework/security/providers/openid/MockAuthoritiesPopulator.java
diff --git a/sandbox/openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationProviderTests.java b/openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationProviderTests.java
similarity index 100%
rename from sandbox/openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationProviderTests.java
rename to openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationProviderTests.java
diff --git a/sandbox/openid/src/test/java/org/springframework/security/providers/openid/OpenIdAuthenticationTokenTests.java b/openid/src/test/java/org/springframework/security/providers/openid/OpenIdAuthenticationTokenTests.java
similarity index 100%
rename from sandbox/openid/src/test/java/org/springframework/security/providers/openid/OpenIdAuthenticationTokenTests.java
rename to openid/src/test/java/org/springframework/security/providers/openid/OpenIdAuthenticationTokenTests.java
diff --git a/sandbox/openid/src/test/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilterTests.java b/openid/src/test/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilterTests.java
similarity index 100%
rename from sandbox/openid/src/test/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilterTests.java
rename to openid/src/test/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilterTests.java
diff --git a/sandbox/openid/src/test/java/org/springframework/security/ui/openid/consumers/MockOpenIDConsumer.java b/openid/src/test/java/org/springframework/security/ui/openid/consumers/MockOpenIDConsumer.java
similarity index 100%
rename from sandbox/openid/src/test/java/org/springframework/security/ui/openid/consumers/MockOpenIDConsumer.java
rename to openid/src/test/java/org/springframework/security/ui/openid/consumers/MockOpenIDConsumer.java
diff --git a/pom.xml b/pom.xml
index 92d64ea061..e61da59f7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,7 @@
         <module>adapters</module>
         <module>portlet</module>
         <module>ntlm</module>
+        <module>openid</module>
         <module>samples</module>
     </modules>