diff --git a/acl/pom.xml b/acl/pom.xml
index 1d6279d0b7..92f114965f 100644
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-security-parent</artifactId>
         <groupId>org.springframework.security</groupId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
diff --git a/cas/pom.xml b/cas/pom.xml
index d978820642..15c41d29e6 100644
--- a/cas/pom.xml
+++ b/cas/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <artifactId>spring-security-cas-client</artifactId>
     <name>Spring Security - CAS support</name>
diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml
index ccead9dd3c..a56f7f3ef1 100644
--- a/core-tiger/pom.xml
+++ b/core-tiger/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <packaging>jar</packaging>    
     <artifactId>spring-security-core-tiger</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 5cc7fb6e9e..29b34e51af 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>spring-security-core</artifactId>
diff --git a/itest/context/pom.xml b/itest/context/pom.xml
index 0eca5dfa6b..e65bf8d772 100644
--- a/itest/context/pom.xml
+++ b/itest/context/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-itest</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <artifactId>spring-security-itest-context</artifactId>
     <name>Spring Security - Miscellaneous Application Context Integration Tests</name>
diff --git a/itest/pom.xml b/itest/pom.xml
index 4694e591d9..870a48f015 100644
--- a/itest/pom.xml
+++ b/itest/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>spring-security-itest</artifactId>
     <name>Spring Security - Integration Tests</name>
     <packaging>pom</packaging>
-    <version>2.0.6.CI-SNAPSHOT</version>
+    <version>2.0.6.RELEASE</version>
     <modules>
         <module>web</module>
         <!-- module>webflow</module-->
diff --git a/itest/web/pom.xml b/itest/web/pom.xml
index b24d258cb7..dee6df09db 100644
--- a/itest/web/pom.xml
+++ b/itest/web/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-itest</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <artifactId>spring-security-itest-web</artifactId>
     <name>Spring Security - Web Integration Tests</name>
diff --git a/ntlm/pom.xml b/ntlm/pom.xml
index badc7838db..eef6c5f9d3 100755
--- a/ntlm/pom.xml
+++ b/ntlm/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>spring-security-ntlm</artifactId>
diff --git a/openid/pom.xml b/openid/pom.xml
index 81334a22c1..a2e57efc29 100644
--- a/openid/pom.xml
+++ b/openid/pom.xml
@@ -3,12 +3,12 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <artifactId>spring-security-openid</artifactId>
     <name>Spring Security - OpenID support</name>
     <description>Spring Security - Support for OpenID</description>
-    <version>2.0.6.CI-SNAPSHOT</version>
+    <version>2.0.6.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index f96d24dd49..b3e674d575 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,17 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-parent</artifactId>
-    <version>2.0.6.CI-SNAPSHOT</version>
+    <version>2.0.6.RELEASE</version>
     <name>Spring Security</name>
     <packaging>pom</packaging>
 
     <modules>
         <module>core</module>
         <module>core-tiger</module>
-        <!-- module>adapters</module -->
         <module>portlet</module>
         <module>ntlm</module>
         <module>openid</module>
-        <module>samples</module>
+        <!--module>samples</module-->
         <module>cas</module>
         <module>acl</module>
         <module>taglibs</module>
diff --git a/portlet/pom.xml b/portlet/pom.xml
index c456a90041..e1936b071c 100644
--- a/portlet/pom.xml
+++ b/portlet/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <artifactId>spring-security-portlet</artifactId>
     <name>Spring Security - Portlet support</name>
diff --git a/samples/cas/client/pom.xml b/samples/cas/client/pom.xml
index 7163020e42..7829d12958 100644
--- a/samples/cas/client/pom.xml
+++ b/samples/cas/client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples-cas</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-cas-client</artifactId>
diff --git a/samples/cas/pom.xml b/samples/cas/pom.xml
index 73b6795676..72f8d4fac0 100644
--- a/samples/cas/pom.xml
+++ b/samples/cas/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-cas</artifactId>
diff --git a/samples/cas/server/pom.xml b/samples/cas/server/pom.xml
index 0cb2fa4e02..c469ae44eb 100644
--- a/samples/cas/server/pom.xml
+++ b/samples/cas/server/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples-cas</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-cas-server</artifactId>
diff --git a/samples/contacts/pom.xml b/samples/contacts/pom.xml
index f56b877311..71f9b9a167 100644
--- a/samples/contacts/pom.xml
+++ b/samples/contacts/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <artifactId>spring-security-samples-contacts</artifactId>
     <name>Spring Security - Contacts sample</name>
diff --git a/samples/dms/pom.xml b/samples/dms/pom.xml
index 0c456396e0..5baa9926b7 100644
--- a/samples/dms/pom.xml
+++ b/samples/dms/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <artifactId>spring-security-samples-dms</artifactId>
     <name>Spring Security - DMS sample</name>
diff --git a/samples/ldap/pom.xml b/samples/ldap/pom.xml
index 423b3b22d1..4028a4a5c4 100644
--- a/samples/ldap/pom.xml
+++ b/samples/ldap/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-ldap</artifactId>
diff --git a/samples/openid/pom.xml b/samples/openid/pom.xml
index d0397b68e9..3521a37e6b 100644
--- a/samples/openid/pom.xml
+++ b/samples/openid/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-openid</artifactId>
diff --git a/samples/pom.xml b/samples/pom.xml
index fb38d257fb..d9d07393c3 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples</artifactId>
diff --git a/samples/portlet/pom.xml b/samples/portlet/pom.xml
index 9a230e0003..e4160b0326 100644
--- a/samples/portlet/pom.xml
+++ b/samples/portlet/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-portlet</artifactId>
diff --git a/samples/preauth/pom.xml b/samples/preauth/pom.xml
index f4fd12d50d..510972175f 100644
--- a/samples/preauth/pom.xml
+++ b/samples/preauth/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-preauth</artifactId>
diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml
index 927ff63698..89fde25924 100644
--- a/samples/tutorial/pom.xml
+++ b/samples/tutorial/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-tutorial</artifactId>
diff --git a/taglibs/pom.xml b/taglibs/pom.xml
index d5be543be7..ba99019a14 100644
--- a/taglibs/pom.xml
+++ b/taglibs/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>spring-security-parent</artifactId>
         <groupId>org.springframework.security</groupId>
-        <version>2.0.6.CI-SNAPSHOT</version>
+        <version>2.0.6.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-taglibs</artifactId>
     <name>Spring Security - JSP taglibs</name>
-    <version>2.0.6.CI-SNAPSHOT</version>
+    <version>2.0.6.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>