diff --git a/pom.xml b/pom.xml
index f7fc50be5..0dfef7f99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-mongo-dist</artifactId>
   <name>Spring Data MongoDB Distribution</name>
-  <version>1.0.0.BUILD-SNAPSHOT</version>
+  <version>1.0.0.M5</version>
   <packaging>pom</packaging>
   <modules>
     <module>spring-data-mongodb</module>
@@ -89,7 +89,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- dist.* properties are used by the antrun tasks below -->
-    <dist.id>spring-data-document</dist.id>
+    <dist.id>spring-data-mongo</dist.id>
     <dist.name>Spring Data Mongo</dist.name>
     <dist.key>SDMONGO</dist.key>
     <dist.version>${project.version}</dist.version>
@@ -174,7 +174,7 @@
               </fileset>
             </copy>
             <move file="${project.basedir}/target/site/reference/pdf/index.pdf"
-                  tofile="${project.basedir}/target/site/reference/pdf/spring-data-document-reference.pdf"
+                  tofile="${project.basedir}/target/site/reference/pdf/spring-data-mongo-reference.pdf"
                   failonerror="false"/>
           </postProcess>
         </configuration>
@@ -257,8 +257,8 @@
         </dependencies>
       </plugin>
     </plugins>
-    <!-- the name of this project is 'spring-data-document-dist';
-         make sure the zip file is just 'spring-data-document'. -->
+    <!-- the name of this project is 'spring-data-mongo-dist';
+         make sure the zip file is just 'spring-data-mongo'. -->
     <finalName>${dist.finalName}</finalName>
   </build>
 
diff --git a/spring-data-mongodb-cross-store/pom.xml b/spring-data-mongodb-cross-store/pom.xml
index 0e23f3672..20ffc6e3e 100644
--- a/spring-data-mongodb-cross-store/pom.xml
+++ b/spring-data-mongodb-cross-store/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-mongodb-parent</artifactId>
-    <version>1.0.0.BUILD-SNAPSHOT</version>
+    <version>1.0.0.M5</version>
     <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
   </parent>
   <artifactId>spring-data-mongodb-cross-store</artifactId>
diff --git a/spring-data-mongodb-log4j/pom.xml b/spring-data-mongodb-log4j/pom.xml
index 148a55c17..d216666b5 100644
--- a/spring-data-mongodb-log4j/pom.xml
+++ b/spring-data-mongodb-log4j/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-mongodb-parent</artifactId>
-    <version>1.0.0.BUILD-SNAPSHOT</version>
+    <version>1.0.0.M5</version>
     <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
   </parent>
   <artifactId>spring-data-mongodb-log4j</artifactId>
diff --git a/spring-data-mongodb-parent/pom.xml b/spring-data-mongodb-parent/pom.xml
index 7601fec9f..a5958ced5 100644
--- a/spring-data-mongodb-parent/pom.xml
+++ b/spring-data-mongodb-parent/pom.xml
@@ -6,7 +6,7 @@
   <artifactId>spring-data-mongodb-parent</artifactId>
   <name>Spring Data MongoDB Parent</name>
   <url>http://www.springsource.org/spring-data/mongodb</url>
-  <version>1.0.0.BUILD-SNAPSHOT</version>
+  <version>1.0.0.M5</version>
   <packaging>pom</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml
index 7dc8d1949..cc4ed6f4c 100644
--- a/spring-data-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<version>1.0.0.M5</version>
 		<relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-mongodb</artifactId>
diff --git a/src/ant/upload-dist.xml b/src/ant/upload-dist.xml
index fbdaad3dc..9f0df90b3 100644
--- a/src/ant/upload-dist.xml
+++ b/src/ant/upload-dist.xml
@@ -7,15 +7,15 @@
 
   ant -f src/ant/upload-dist.xml \
       -Ddist.id=spring-data-document \
-      -Ddist.name='Spring Data Document' \
+      -Ddist.name='Spring Data MongoDB' \
       -Ddist.key=DATADOC \
       -Ddist.releaseType=milestone \
       -Ddist.accessKey=<access key> \
       -Ddist.secretKey=<secret key> \
       -Ddist.bucketName=dist.springframework.org \
-      -Ddist.fileName=spring-data-document-1.0.0.M1.zip \
-      -Ddist.filePath=../../spring-data-document-1.0.0.M1.zip \
-      -Ddist.version=1.0.0.M1 \
+      -Ddist.fileName=spring-data-mongodb-1.0.0.M5.zip \
+      -Ddist.filePath=../../spring-data-mongodb-1.0.0.M5.zip \
+      -Ddist.version=1.0.0.M5 \
       upload-dist
   -->
 
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index d942cd91b..cd3f323f0 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,6 +1,54 @@
 Spring Data Document Changelog
 =============================================
 
+Changes in version 1.0.0.M5 MongoDB (2011-10-24)
+------------------------------------------------
+
+** Bug
+    * [DATAMONGO-259] - Maps inside collections are not written correctly
+    * [DATAMONGO-268] - CustomConversions is too liberal in registering "simple types" (asymmetric conversion)
+    * [DATAMONGO-269] - XML configuration for replica sets is not working
+    * [DATAMONGO-275] - DBRef fields and collections are returning nulls
+    * [DATAMONGO-281] - Improve the <mongo:db-factory> to handle blank username and password when using property placholders like ${mongo.username}
+    * [DATAMONGO-282] - Cannot create a "range" query
+    * [DATAMONGO-284] - Execution of Querydsl query maps id incorrectly
+    * [DATAMONGO-285] - NPE in MappingMongoConverter.writeMapInternal when saving a Map<String,Object> with val instance of Collection
+    * [DATAMONGO-288] - querying same property multiple times produces incorrect query 
+    * [DATAMONGO-289] - AbstractMongoEventListener will never call onAfterLoad
+    * [DATAMONGO-294] - List elements nested in Map lose their type when persisted
+
+** Improvement
+    * [DATAMONGO-65] - Allow Spring EL usage in collection name attribute of @Document
+    * [DATAMONGO-183] - Query count() support for pagination
+    * [DATAMONGO-258] - M4 documentation states SD Commons 1.1.0.M1 required but actually needs 1.2.0.M1
+    * [DATAMONGO-261] - Reference documentation for geoNear queries has no stable section id
+    * [DATAMONGO-270] - Approach Sonar results to improve code quality
+    * [DATAMONGO-271] - Remove 'document' from cross-store package names
+    * [DATAMONGO-272] - Namespace configuration file still resides in 'document' package
+    * [DATAMONGO-276] - QueryUtils should be public
+    * [DATAMONGO-280] - Add maxAutoConnectRetryTime for <mongo:db-factory> and  MongoOptionsFactoryBean
+    * [DATAMONGO-283] - $and support
+    * [DATAMONGO-286] - MongoDB Repository no query methods for $lte and $gte
+    * [DATAMONGO-291] - Path expressions in repository methods should honour mapping metadata
+    * [DATAMONGO-293] - Add support for new polygon based within search in Mongo 2.0.
+    * [DATAMONGO-295] - Allow MongoTemplate to be configured using MongoURI
+    * [DATAMONGO-300] - Re-work the Query/Criteria to better support $and, $or and $nor queries
+    * [DATAMONGO-302] - Consistently handle null values given to CrudRepository implementation
+
+** New Feature
+    * [DATAMONGO-230] - MongoTemplate missing method remove(Object object, String collectionName)
+
+** Refactoring
+    * [DATAMONGO-274] - Split up repository package according to the structure in Spring Data JPA
+
+** Task
+    * [DATAMONGO-264] - Ensure Data Document examples work 
+    * [DATAMONGO-265] - Create new github repository for mongodb
+    * [DATAMONGO-266] - Create new github repository for CouchDB
+    * [DATAMONGO-297] - Prune project directory
+    * [DATAMONGO-303] - Update to QueryDsl 2.2.4
+
+
 Changes in version 1.0.0.M4 MongoDB (2011-09-01)
 ------------------------------------------------