diff --git a/build-spring-framework/pom.xml b/build-spring-framework/pom.xml
index a304529a605..c970f2e871a 100644
--- a/build-spring-framework/pom.xml
+++ b/build-spring-framework/pom.xml
@@ -14,7 +14,7 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring</artifactId>
   <packaging>pom</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <name>Spring Framework</name>
   <description>Spring is a layered Java/J2EE application platform, based on code published in Expert
   One-on-One J2EE Design and Development by Rod Johnson (Wrox, 2002). </description>
diff --git a/build.properties b/build.properties
index ffe56da39a2..b3188b69fac 100644
--- a/build.properties
+++ b/build.properties
@@ -1,5 +1,6 @@
 version=3.0.0
-release.type=integration
+build.stamp=M4
+release.type=milestone
 natural.name=spring-framework
 project.name=Spring Framework
 project.key=SPR
@@ -20,7 +21,4 @@ compiler.args=-enableJavadoc -warn:none
 
 # For development in trunk
 #release.type=integration
-#build.stamp=BUILD-SNAPSHOT
-overwrite=true
-ci.build=true
-
+#build.stamp=BUILD-SNAPSHOT
\ No newline at end of file
diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml
index 12a50be4fd9..4817ac77805 100644
--- a/org.springframework.aop/pom.xml
+++ b/org.springframework.aop/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-aop</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.asm/pom.xml b/org.springframework.asm/pom.xml
index 36d4412917d..83bf9902de2 100644
--- a/org.springframework.asm/pom.xml
+++ b/org.springframework.asm/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-asm</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
 
diff --git a/org.springframework.aspects/pom.xml b/org.springframework.aspects/pom.xml
index a90e6a7ff9b..6bd483a7c86 100644
--- a/org.springframework.aspects/pom.xml
+++ b/org.springframework.aspects/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-aspects</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml
index ef40b652400..82e73be381d 100644
--- a/org.springframework.beans/pom.xml
+++ b/org.springframework.beans/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-beans</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml
index 546aab9705d..425d23dffc1 100644
--- a/org.springframework.context.support/pom.xml
+++ b/org.springframework.context.support/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-context-support</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
 
diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml
index 53098657aab..c1893cbc892 100644
--- a/org.springframework.context/pom.xml
+++ b/org.springframework.context/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-context</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml
index 776dbc1c299..778adf798f4 100644
--- a/org.springframework.core/pom.xml
+++ b/org.springframework.core/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-core</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.expression/pom.xml b/org.springframework.expression/pom.xml
index 05077bf8e88..25c595199a5 100644
--- a/org.springframework.expression/pom.xml
+++ b/org.springframework.expression/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-expression</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.instrument.classloading/pom.xml b/org.springframework.instrument.classloading/pom.xml
index 40c6da46a67..382b215112f 100644
--- a/org.springframework.instrument.classloading/pom.xml
+++ b/org.springframework.instrument.classloading/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-instrument-classloading</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.instrument/pom.xml b/org.springframework.instrument/pom.xml
index 14f69b1761c..2daba394adf 100644
--- a/org.springframework.instrument/pom.xml
+++ b/org.springframework.instrument/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-instrument</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
 </project>
diff --git a/org.springframework.integration-tests/pom.xml b/org.springframework.integration-tests/pom.xml
index 12444da761c..c2d1e95e646 100644
--- a/org.springframework.integration-tests/pom.xml
+++ b/org.springframework.integration-tests/pom.xml
@@ -4,7 +4,7 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-integration-tests</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <dependencies>
     <dependency>
       <groupId>com.caucho</groupId>
diff --git a/org.springframework.jdbc/pom.xml b/org.springframework.jdbc/pom.xml
index 7e9a847c30e..0318d688efe 100644
--- a/org.springframework.jdbc/pom.xml
+++ b/org.springframework.jdbc/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-jdbc</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/org.springframework.jms/pom.xml b/org.springframework.jms/pom.xml
index 6a53763ce86..5e01274717c 100644
--- a/org.springframework.jms/pom.xml
+++ b/org.springframework.jms/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-jms</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
   <dependencies>
@@ -64,37 +64,37 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.0.0.BUILD-SNAPSHOT</version>
+      <version>3.0.0.M4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.0.0.BUILD-SNAPSHOT</version>
+      <version>3.0.0.M4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.0.0.BUILD-SNAPSHOT</version>
+      <version>3.0.0.M4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.0.0.BUILD-SNAPSHOT</version>
+      <version>3.0.0.M4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-oxm</artifactId>
-      <version>3.0.0.BUILD-SNAPSHOT</version>
+      <version>3.0.0.M4</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>3.0.0.BUILD-SNAPSHOT</version>
+      <version>3.0.0.M4</version>
       <optional>true</optional>
     </dependency>
   </dependencies>
diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml
index 278283b5fbc..778b591f276 100644
--- a/org.springframework.orm/pom.xml
+++ b/org.springframework.orm/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-orm</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.oxm/pom.xml b/org.springframework.oxm/pom.xml
index 29d67334373..f45b7085891 100644
--- a/org.springframework.oxm/pom.xml
+++ b/org.springframework.oxm/pom.xml
@@ -6,12 +6,12 @@
 	<groupId>org.springframework</groupId>
 	<artifactId>spring-oxm</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.0.BUILD-SNAPSHOT</version>
+	<version>3.0.0.M4</version>
 	<parent>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-parent</artifactId>
 		<relativePath>../org.springframework.spring-parent</relativePath>
-		<version>3.0.0.BUILD-SNAPSHOT</version>
+		<version>3.0.0.M4</version>
 	</parent>
 
 	<dependencies>
diff --git a/org.springframework.spring-library/pom.xml b/org.springframework.spring-library/pom.xml
index c416fc871e5..5b0092470fa 100644
--- a/org.springframework.spring-library/pom.xml
+++ b/org.springframework.spring-library/pom.xml
@@ -14,7 +14,7 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-library</artifactId>
   <packaging>libd</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <name>Spring Framework</name>
   <description>Spring is a layered Java/J2EE application platform, based on code published in Expert
   One-on-One J2EE Design and Development by Rod Johnson (Wrox, 2002). </description>
diff --git a/org.springframework.spring-parent/pom.xml b/org.springframework.spring-parent/pom.xml
index ccb90bea33a..41686a9be36 100644
--- a/org.springframework.spring-parent/pom.xml
+++ b/org.springframework.spring-parent/pom.xml
@@ -14,7 +14,7 @@
   <artifactId>spring-parent</artifactId>
   <packaging>pom</packaging>
   <name>Spring Framework - Parent</name>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <description>Spring Framework Parent</description>
   <scm>
     <url>https://fisheye.springframework.org/browse/spring-framework</url>
diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml
index f186f8a2d68..f602f2c27a1 100644
--- a/org.springframework.test/pom.xml
+++ b/org.springframework.test/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-test</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.transaction/pom.xml b/org.springframework.transaction/pom.xml
index 4df0fbcfd09..bdcbc60428e 100644
--- a/org.springframework.transaction/pom.xml
+++ b/org.springframework.transaction/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-tx</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.web.portlet/pom.xml b/org.springframework.web.portlet/pom.xml
index 68fa02511e2..fe5450d7543 100644
--- a/org.springframework.web.portlet/pom.xml
+++ b/org.springframework.web.portlet/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-webmvc-portlet</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.web.servlet/pom.xml b/org.springframework.web.servlet/pom.xml
index d3f323a9bc1..197d2dfda27 100644
--- a/org.springframework.web.servlet/pom.xml
+++ b/org.springframework.web.servlet/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-webmvc</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
   <profiles>
diff --git a/org.springframework.web/pom.xml b/org.springframework.web/pom.xml
index 23719aa423d..9f78845b5dd 100644
--- a/org.springframework.web/pom.xml
+++ b/org.springframework.web/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-web</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <version>3.0.0.M4</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0.M4</version>
   </parent>
 
   <dependencies>