diff --git a/cache-ehcache/pom.xml b/cache-ehcache/pom.xml
index 52cca813b6..a938829232 100644
--- a/cache-ehcache/pom.xml
+++ b/cache-ehcache/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/cache-infinispan/pom.xml b/cache-infinispan/pom.xml
index 328c7afa03..23242b9864 100644
--- a/cache-infinispan/pom.xml
+++ b/cache-infinispan/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/cache-jbosscache/pom.xml b/cache-jbosscache/pom.xml
index c725ed3043..1cfe58017c 100644
--- a/cache-jbosscache/pom.xml
+++ b/cache-jbosscache/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/cache-oscache/pom.xml b/cache-oscache/pom.xml
index 71c2dde718..ea004ca641 100644
--- a/cache-oscache/pom.xml
+++ b/cache-oscache/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/cache-swarmcache/pom.xml b/cache-swarmcache/pom.xml
index 94cb0a78ab..4881664de9 100644
--- a/cache-swarmcache/pom.xml
+++ b/cache-swarmcache/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/connection-c3p0/pom.xml b/connection-c3p0/pom.xml
index 352e6149a1..faa4221d47 100644
--- a/connection-c3p0/pom.xml
+++ b/connection-c3p0/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/connection-proxool/pom.xml b/connection-proxool/pom.xml
index ccfddb9676..232d4d99f5 100644
--- a/connection-proxool/pom.xml
+++ b/connection-proxool/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/core/pom.xml b/core/pom.xml
index daee9a10dc..96f6b072fe 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/core/src/main/java/org/hibernate/annotations/DiscriminatorOptions.java b/core/src/main/java/org/hibernate/annotations/DiscriminatorOptions.java
index 55a2a0a6c3..fc58a751bd 100644
--- a/core/src/main/java/org/hibernate/annotations/DiscriminatorOptions.java
+++ b/core/src/main/java/org/hibernate/annotations/DiscriminatorOptions.java
@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-// $Id:$
+// $Id$
 package org.hibernate.annotations;
 
 import java.lang.annotation.Retention;
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 3256ab0aa1..913d957b66 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/documentation/devguide/pom.xml b/documentation/devguide/pom.xml
index b10f857fd1..e4d68d92f4 100644
--- a/documentation/devguide/pom.xml
+++ b/documentation/devguide/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/documentation/envers/pom.xml b/documentation/envers/pom.xml
index a3392442d9..4d209f75b7 100644
--- a/documentation/envers/pom.xml
+++ b/documentation/envers/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/documentation/jbosscache2/pom.xml b/documentation/jbosscache2/pom.xml
index 9b1b4cf26d..f792dac334 100644
--- a/documentation/jbosscache2/pom.xml
+++ b/documentation/jbosscache2/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/documentation/manual/pom.xml b/documentation/manual/pom.xml
index eb018596d8..cd54ffdce4 100644
--- a/documentation/manual/pom.xml
+++ b/documentation/manual/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/documentation/pom.xml b/documentation/pom.xml
index e7bbecdd59..1120d79b35 100644
--- a/documentation/pom.xml
+++ b/documentation/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/documentation/quickstart/pom.xml b/documentation/quickstart/pom.xml
index fa24d2d134..0e8a7438a0 100644
--- a/documentation/quickstart/pom.xml
+++ b/documentation/quickstart/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/documentation/quickstart/tutorials/annotations/pom.xml b/documentation/quickstart/tutorials/annotations/pom.xml
index 6e3507a474..2a6491d17f 100644
--- a/documentation/quickstart/tutorials/annotations/pom.xml
+++ b/documentation/quickstart/tutorials/annotations/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.hibernate.tutorials</groupId>
         <artifactId>hibernate-tutorials</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/documentation/quickstart/tutorials/basic/pom.xml b/documentation/quickstart/tutorials/basic/pom.xml
index 52cc679a76..60d0ff68a4 100644
--- a/documentation/quickstart/tutorials/basic/pom.xml
+++ b/documentation/quickstart/tutorials/basic/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.hibernate.tutorials</groupId>
         <artifactId>hibernate-tutorials</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/documentation/quickstart/tutorials/entitymanager/pom.xml b/documentation/quickstart/tutorials/entitymanager/pom.xml
index 71317d51a0..a60db25a7b 100644
--- a/documentation/quickstart/tutorials/entitymanager/pom.xml
+++ b/documentation/quickstart/tutorials/entitymanager/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>hibernate-tutorials</artifactId>
         <groupId>org.hibernate.tutorials</groupId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
     </parent>
 
     <artifactId>hibernate-tutorial-entitymanager</artifactId>
diff --git a/documentation/quickstart/tutorials/envers/pom.xml b/documentation/quickstart/tutorials/envers/pom.xml
index 65f707a7a8..d923daef67 100644
--- a/documentation/quickstart/tutorials/envers/pom.xml
+++ b/documentation/quickstart/tutorials/envers/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>hibernate-tutorials</artifactId>
         <groupId>org.hibernate.tutorials</groupId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
     </parent>
 
     <artifactId>hibernate-tutorial-envers</artifactId>
diff --git a/documentation/quickstart/tutorials/pom.xml b/documentation/quickstart/tutorials/pom.xml
index 65fe076afd..34175184f5 100644
--- a/documentation/quickstart/tutorials/pom.xml
+++ b/documentation/quickstart/tutorials/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.hibernate.tutorials</groupId>
     <artifactId>hibernate-tutorials</artifactId>
-    <version>3.6.0-SNAPSHOT</version>
+    <version>3.6.0.CR2</version>
     <packaging>pom</packaging>
 
     <name>Hibernate Getting Started Guide Tutorials</name>
diff --git a/entitymanager/pom.xml b/entitymanager/pom.xml
index 3341100370..837674172f 100644
--- a/entitymanager/pom.xml
+++ b/entitymanager/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/envers/pom.xml b/envers/pom.xml
index 931e38b802..6dd56c70c5 100644
--- a/envers/pom.xml
+++ b/envers/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/jdbc3-testing/pom.xml b/jdbc3-testing/pom.xml
index a8042aa74f..7f502e5f61 100644
--- a/jdbc3-testing/pom.xml
+++ b/jdbc3-testing/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/jdbc4-testing/pom.xml b/jdbc4-testing/pom.xml
index 8a9ff77fcc..39e79c8eb6 100644
--- a/jdbc4-testing/pom.xml
+++ b/jdbc4-testing/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 87297eaa8f..cf4d17f8a9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.6.0-SNAPSHOT</version>
+    <version>3.6.0.CR2</version>
 
     <name>Hibernate Core Parent POM</name>
     <description>The base POM for all Hibernate Core modules.</description>
@@ -54,9 +54,9 @@
     </licenses>
 
     <scm>
-        <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection>
-        <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection>
-        <url>https://svn.jboss.org/repos/hibernate/core/trunk</url>
+        <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.6.0.CR2</connection>
+        <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.6.0.CR2</developerConnection>
+        <url>https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.6.0.CR2</url>
     </scm>
 
     <ciManagement>
diff --git a/pom.xml b/pom.xml
index f8554720a0..509c40e48d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>parent/pom.xml</relativePath>
     </parent>
 
diff --git a/testing/pom.xml b/testing/pom.xml
index 3b7db6b67a..537091102c 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index a5f39af5a9..88cf7d72f8 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/BaseClass.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/BaseClass.java
index 509aafdd8a..7a5544ba44 100644
--- a/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/BaseClass.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/BaseClass.java
@@ -22,7 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.inheritance.discriminatoroptions;
 
 import javax.persistence.DiscriminatorValue;
diff --git a/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/SubClass.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/SubClass.java
index 25d49ff493..af56263b0e 100644
--- a/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/SubClass.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/SubClass.java
@@ -22,7 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.inheritance.discriminatoroptions;
 
 import javax.persistence.DiscriminatorValue;
diff --git a/testsuite/src/test/java/org/hibernate/test/annotations/various/DBTimestamped.java b/testsuite/src/test/java/org/hibernate/test/annotations/various/DBTimestamped.java
index be616f123e..d4122f8aca 100644
--- a/testsuite/src/test/java/org/hibernate/test/annotations/various/DBTimestamped.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/various/DBTimestamped.java
@@ -22,7 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.various;
 
 import java.util.Date;
diff --git a/testsuite/src/test/java/org/hibernate/test/annotations/various/VMTimestamped.java b/testsuite/src/test/java/org/hibernate/test/annotations/various/VMTimestamped.java
index 0de8daae02..be34cd5e12 100644
--- a/testsuite/src/test/java/org/hibernate/test/annotations/various/VMTimestamped.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/various/VMTimestamped.java
@@ -22,7 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.various;
 
 import java.util.Date;
diff --git a/tutorials/eg/pom.xml b/tutorials/eg/pom.xml
index f548afbaec..dd653bf7d9 100644
--- a/tutorials/eg/pom.xml
+++ b/tutorials/eg/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-tutorials</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/tutorials/pom.xml b/tutorials/pom.xml
index 4191fcb49e..e5c2ca73f3 100644
--- a/tutorials/pom.xml
+++ b/tutorials/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/tutorials/web/pom.xml b/tutorials/web/pom.xml
index f33e79fbca..d577633353 100644
--- a/tutorials/web/pom.xml
+++ b/tutorials/web/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-tutorials</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>