diff --git a/pom.xml b/pom.xml
index 102420e0d..4bf816105 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-commons-dist</artifactId>
 	<name>Spring Data Commons Distribution</name>
-	<version>1.2.0.BUILD-SNAPSHOT</version>
+	<version>1.2.0.M2</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/spring-data-commons-core/pom.xml b/spring-data-commons-core/pom.xml
index 83adecb62..8ae117081 100644
--- a/spring-data-commons-core/pom.xml
+++ b/spring-data-commons-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-commons-parent</artifactId>
-		<version>1.2.0.BUILD-SNAPSHOT</version>
+		<version>1.2.0.M2</version>
 		<relativePath>../spring-data-commons-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-commons-core</artifactId>
diff --git a/spring-data-commons-parent/pom.xml b/spring-data-commons-parent/pom.xml
index 3766b1213..7195758ec 100644
--- a/spring-data-commons-parent/pom.xml
+++ b/spring-data-commons-parent/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>spring-data-commons-parent</artifactId>
 	<name>Spring Data Commons Parent</name>
 	<url>http://www.springsource.org/spring-data</url>
-	<version>1.2.0.BUILD-SNAPSHOT</version>
+	<version>1.2.0.M2</version>
 	<packaging>pom</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index df7098c0e..0318ffb2c 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,6 +1,33 @@
 Spring Data Commons Changelog
 =============================================
 
+Changes in version 1.2.0.M2 (2011-10-21)
+----------------------------------------
+
+** Bug
+    * [DATACMNS-81] - RepositoryInterfaceAwareBeanPostProcessor potentially suffers from NullPointerException
+
+** Improvement
+    * [DATACMNS-79] - Treat empty strings as null for username and password for UserCredentials
+    * [DATACMNS-82] - Increase performance by defaulting PlatformTransactionManager bean name
+    * [DATACMNS-83] - RepositoryInterfaceAwareBeanPostProcessor should log not being able to load the repo interface
+    * [DATACMNS-84] - Improve access to property paths
+    * [DATACMNS-85] - Extend PersistentPropertyPath
+    * [DATACMNS-87] - AbstractMappingContext.getPropertyPath(...) must not access the leaf property's PersistentEntity
+
+** New Feature
+    * [DATACMNS-76] - Extract core converter infrastructure from MongoDB module
+    * [DATACMNS-78] - Add LessThanEquals and GreaterThanEquals as supported query keywords
+
+** Refactoring
+    * [DATACMNS-73] - Create dedicated crossstore package
+    * [DATACMNS-75] - Consolidate entity instantiation strategies
+    * [DATACMNS-86] - Remove o.s.d.transaction package, move ChangeSetBackedTransactionSynchronization to o.s.d.persistence
+
+** Task
+    * [DATACMNS-80] - Upgrade to Spring 3.0.6
+
+
 Changes in version 1.2.0.M1 (2011-09-01)
 ----------------------------------------