diff --git a/acl/pom.xml b/acl/pom.xml
index 549da4cee4..0c09c6e4d3 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.4-SNAPSHOT</version>
+        <version>2.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
diff --git a/adapters/catalina/pom.xml b/adapters/catalina/pom.xml
index 31c0686169..00607e4dce 100644
--- a/adapters/catalina/pom.xml
+++ b/adapters/catalina/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-adapters</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.0.4</version>
   </parent>
   <artifactId>spring-security-catalina</artifactId>
   <name>Spring Security - Catalina adapter</name>
diff --git a/adapters/jboss/pom.xml b/adapters/jboss/pom.xml
index 002614cabe..bca6ba74db 100644
--- a/adapters/jboss/pom.xml
+++ b/adapters/jboss/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-adapters</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.0.4</version>
   </parent>
   <artifactId>spring-security-jboss</artifactId>
   <name>Spring Security - JBoss adapter</name>
diff --git a/adapters/jetty/pom.xml b/adapters/jetty/pom.xml
index 74b37ee21d..56d0ec9c57 100644
--- a/adapters/jetty/pom.xml
+++ b/adapters/jetty/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-adapters</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.0.4</version>
   </parent>
   <artifactId>spring-security-jetty</artifactId>
   <name>Spring Security - Jetty adapter</name>
diff --git a/adapters/pom.xml b/adapters/pom.xml
index 856d3141ff..1ed39c76f4 100644
--- a/adapters/pom.xml
+++ b/adapters/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-parent</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.0.4</version>
   </parent>
   <artifactId>spring-security-adapters</artifactId>
   <name>Spring Security - Adapters</name>
diff --git a/adapters/resin/pom.xml b/adapters/resin/pom.xml
index 8baa06a72f..5418804ba0 100644
--- a/adapters/resin/pom.xml
+++ b/adapters/resin/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-adapters</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.0.4</version>
   </parent>
   <artifactId>spring-security-resin</artifactId>
   <name>Spring Security - Resin adapter</name>
diff --git a/cas/pom.xml b/cas/pom.xml
index e115b61437..eeca3d7df2 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.4-SNAPSHOT</version>
+        <version>2.0.4</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 b2cc8588de..e6c61c5522 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.4-SNAPSHOT</version>
+        <version>2.0.4</version>
     </parent>
     <packaging>bundle</packaging>    
     <artifactId>spring-security-core-tiger</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 5c523098a7..519723a9ce 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.4-SNAPSHOT</version>
+        <version>2.0.4</version>
     </parent>
     <packaging>bundle</packaging>
     <artifactId>spring-security-core</artifactId>
diff --git a/ntlm/pom.xml b/ntlm/pom.xml
index 9161de7536..2927fc8779 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.4-SNAPSHOT</version>
+        <version>2.0.4</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>spring-security-ntlm</artifactId>
diff --git a/openid/pom.xml b/openid/pom.xml
index fcb98d125b..ec9bfac43f 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.4-SNAPSHOT</version>
+        <version>2.0.4</version>
     </parent>
     <artifactId>spring-security-openid</artifactId>
     <name>Spring Security - OpenID support</name>
     <description>Spring Security - Support for OpenID</description>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.0.4</version>
     <packaging>bundle</packaging>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 1e484b1713..32f79820f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-parent</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.0.4</version>
     <name>Spring Security</name>
     <packaging>pom</packaging>
 
@@ -38,9 +38,9 @@
 
     <!-- Note when doing releases: tagBase is set in release plugin configuration below -->
     <scm>
-        <connection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/trunk</connection>
-        <developerConnection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/trunk</developerConnection>
-        <url>http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/spring-security/trunk/</url>
+        <connection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/tags/spring-security-parent-2.0.4</connection>
+        <developerConnection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/tags/spring-security-parent-2.0.4</developerConnection>
+        <url>http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/spring-security/tags/spring-security-parent-2.0.4</url>
     </scm>
 
     <issueManagement>
diff --git a/portlet/pom.xml b/portlet/pom.xml
index e75a26a6a0..37796cd8e1 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.4-SNAPSHOT</version>
+        <version>2.0.4</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 2ac9b05b71..61784feaa3 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.4-SNAPSHOT</version>
+        <version>2.0.4</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 0c186ad0ed..3c7b54ac73 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.4-SNAPSHOT</version>
+        <version>2.0.4</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 ae808dd7e2..edd8df90de 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.4-SNAPSHOT</version>
+        <version>2.0.4</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 2e6fba3e29..1f454cfee2 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.4-SNAPSHOT</version>
+        <version>2.0.4</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 6b7ef93525..60a0525fa9 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.4-SNAPSHOT</version>
+        <version>2.0.4</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 ccab824eb2..3d7abaef1b 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.4-SNAPSHOT</version>
+        <version>2.0.4</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 d3c9fc3a08..9e5c3497fb 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.4-SNAPSHOT</version>
+        <version>2.0.4</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-openid</artifactId>
diff --git a/samples/pom.xml b/samples/pom.xml
index daeb9c06ae..c489b1cee8 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.4-SNAPSHOT</version>
+        <version>2.0.4</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 9c0dea3652..7e799d3366 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.4-SNAPSHOT</version>
+        <version>2.0.4</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 9ddf394a09..21888a593f 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.4-SNAPSHOT</version>
+        <version>2.0.4</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 50e52766b3..e1d992e0ca 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.4-SNAPSHOT</version>
+        <version>2.0.4</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-tutorial</artifactId>
diff --git a/taglibs/pom.xml b/taglibs/pom.xml
index e2c0547b74..1325866b87 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.4-SNAPSHOT</version>
+        <version>2.0.4</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.4-SNAPSHOT</version>
+    <version>2.0.4</version>
     <packaging>jar</packaging>
 
     <dependencies>