diff --git a/spring-batch-infrastructure/ivy.xml b/spring-batch-infrastructure/ivy.xml
index 3eb58c4eb..8a3058ac9 100644
--- a/spring-batch-infrastructure/ivy.xml
+++ b/spring-batch-infrastructure/ivy.xml
@@ -26,6 +26,7 @@
 		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.5.4" conf="test->runtime,provided"/>
 		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="optional->runtime,provided"/>
 		<dependency org="javax.jms" name="com.springsource.javax.jms" rev="1.1.0" conf="optional->runtime,provided"/>
+		<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.1" conf="optional->runtime,provided"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime,provided"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.lang" rev="2.1.0" conf="optional->runtime,provided"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.io" rev="1.4.0" conf="test->runtime,provided"/>
@@ -39,6 +40,7 @@
 		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="optional->runtime,provided"/>
 		<dependency org="org.springframework.ws" name="org.springframework.oxm" rev="1.5.5.A" conf="optional->runtime,provided"/>
 		<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.A" conf="optional->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.6.A" conf="compile->runtime,provided"/>
 		<dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.A" conf="compile->runtime,provided"/>
 		<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.A" conf="optional->runtime,provided"/>
 		<dependency org="org.springframework" name="org.springframework.jms" rev="2.5.6.A" conf="optional->runtime,provided"/>
diff --git a/spring-batch-infrastructure/template.mf b/spring-batch-infrastructure/template.mf
index 42d6735d7..3b0bc0eed 100644
--- a/spring-batch-infrastructure/template.mf
+++ b/spring-batch-infrastructure/template.mf
@@ -4,35 +4,32 @@ Bundle-Name: Spring Batch Infrastructure
 Bundle-Vendor: Spring
 Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
-Ignored-Existing-Headers: 
- Import-Package,
- Export-Package
 Import-Template: 
  com.thoughtworks.xstream.*;version="[1.3,1.4)";resolution:=optional,
  org.codehaus.jettison.*;version="[1.0,1.1)";resolution:=optional,
  org.codehaus.jackson.*;version="[1.0.1,1.1)";resolution:=optional,
- org.aopalliance.*;version="[1.0.0, 2.0.0)",
+ org.aopalliance.*;version="[1.0.0,2.0.0)",
  org.aspectj.*;version="[1.5.2,1.7.0)",
- org.hibernate.*;version="[3.2.5.ga, 3.3.0.ga)";resolution:=optional,
+ org.hibernate.*;version="[3.2.5.ga,3.3.0.ga)";resolution:=optional,
  org.apache.commons.lang.*;version="[2.1,3.0)";resolution:=optional,
- org.apache.commons.logging.*;version="[1.1.0, 2.0.0)",
+ org.apache.commons.logging.*;version="[1.1.0,2.0.0)",
  com.ibatis.sqlmap.*;version="[2.3.0,3.0.0)";resolution:=optional,
- org.springframework.batch.*;version="[2.0.0, 3.0.0)",
- org.springframework.aop.*;version="[2.5.5, 4.0.0)",
- org.springframework.beans.*;version="[2.5.5, 4.0.0)",
- org.springframework.context.*;version="[2.5.5, 4.0.0)",
- org.springframework.core.*;version="[2.5.5, 4.0.0)",
- org.springframework.dao.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.jdbc.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.jms.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.mail.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.orm.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.oxm.*;version="[1.5.5, 2.0.0)";resolution:=optional,
- org.springframework.xml.*;version="[1.5.5, 2.0.0)";resolution:=optional,
- org.springframework.validation.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.transaction.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.util.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.osgi.*;version="[1.1.0, 2.0.0)";resolution:=optional,
+ org.springframework.batch.*;version="[2.0.0,3.0.0)",
+ org.springframework.aop.*;version="[2.5.5,4.0.0)",
+ org.springframework.beans.*;version="[2.5.5,4.0.0)",
+ org.springframework.context.*;version="[2.5.5,4.0.0)",
+ org.springframework.core.*;version="[2.5.5,4.0.0)",
+ org.springframework.dao.*;version="[2.5.5,4.0.0)";resolution:=optional,
+ org.springframework.jdbc.*;version="[2.5.5,4.0.0)";resolution:=optional,
+ org.springframework.jms.*;version="[2.5.5,4.0.0)";resolution:=optional,
+ org.springframework.mail.*;version="[2.5.5,4.0.0)";resolution:=optional,
+ org.springframework.orm.*;version="[2.5.5,4.0.0)";resolution:=optional,
+ org.springframework.oxm.*;version="[1.5.5,2.0.0)";resolution:=optional,
+ org.springframework.xml.*;version="[1.5.5,2.0.0)";resolution:=optional,
+ org.springframework.validation.*;version="[2.5.5,4.0.0)";resolution:=optional,
+ org.springframework.transaction.*;version="[2.5.5,4.0.0)";resolution:=optional,
+ org.springframework.util.*;version="[2.5.5,4.0.0)";resolution:=optional,
+ org.springframework.osgi.*;version="[1.1.0,2.0.0)";resolution:=optional,
  javax.sql.*;version="0";resolution:=optional,
  javax.jms;version="0";resolution:=optional,
  javax.persistence;version="0";resolution:=optional,
diff --git a/spring-batch-test/template.mf b/spring-batch-test/template.mf
index 85392fcf2..b5fca4d18 100644
--- a/spring-batch-test/template.mf
+++ b/spring-batch-test/template.mf
@@ -28,6 +28,7 @@ Import-Template:
  org.springframework.jdbc.*;version="[2.5.5, 4.0.0)";resolution:=optional,
  org.springframework.jms.*;version="[2.5.5, 4.0.0)";resolution:=optional,
  org.springframework.orm.*;version="[2.5.5, 4.0.0)";resolution:=optional,
+ org.springframework.test.*;version="[2.5.5, 4.0.0)";resolution:=optional,
  org.springframework.transaction.*;version="[2.5.5, 4.0.0)";resolution:=optional,
  org.springframework.util.*;version="[2.5.5, 4.0.0)";resolution:=optional,
  org.springframework.validation.*;version="[2.5.5, 4.0.0)";resolution:=optional,
diff --git a/src/site/apt/downloads.apt b/src/site/apt/downloads.apt
index 4fb0c3942..ae30fa5d6 100644
--- a/src/site/apt/downloads.apt
+++ b/src/site/apt/downloads.apt
@@ -7,7 +7,7 @@
 
 Spring Batch Downloads
 
-  The current GA release is <<2.1.0.M4>>, the latest snapshots are <<2.1.0.CI-SNAPSHOT>>.  The version 2.0.x branch is still open for bugfixes (the last release was <<2.0.3.RELEASE>>). The version 1.1.x branch is now in maintenance (the last release was <<1.1.4.RELEASE>>).
+  The current GA release is <<2.0.4.RELEASE>>, the latest stable development version is <<2.1.0.RC1>> the latest snapshots are <<2.1.0.CI-SNAPSHOT>>.  The version 2.0.x branch is still open for bugfixes. The version 1.1.x branch is now in maintenance (the last release was <<1.1.4.RELEASE>>).
 
 * Zip Downloads
 
@@ -37,7 +37,7 @@ Spring Batch Downloads
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>spring-batch-core</artifactId>
-    <version>2.1.0.M4</version>
+    <version>2.1.0.RC1</version>
 </dependency>
 +---------------
 
@@ -70,7 +70,7 @@ Spring Batch Downloads
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>org.springframework.batch.core</artifactId>
-    <version>2.1.0.M4</version>
+    <version>2.1.0.RC1</version>
 </dependency>
 +---------------
 
@@ -96,7 +96,7 @@ Spring Batch Downloads
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>spring-batch-core</artifactId>
-    <version>2.1.0.M4</version>
+    <version>2.1.0.RC1</version>
 </dependency>
 +---------------
 
@@ -120,7 +120,7 @@ Spring Batch Downloads
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>org.springframework.batch.core</artifactId>
-    <version>2.1.0.M4</version>
+    <version>2.1.0.RC1</version>
 </dependency>
 +---------------
 
diff --git a/src/site/docbook/reference/index.xml b/src/site/docbook/reference/index.xml
index 5af6a0b9e..241a58e6d 100644
--- a/src/site/docbook/reference/index.xml
+++ b/src/site/docbook/reference/index.xml
@@ -5,7 +5,7 @@
 	<bookinfo>
 		<title>Spring Batch - Reference Documentation</title>
 
-		<releaseinfo>Spring Batch 2.1.0.M4</releaseinfo>
+		<releaseinfo>Spring Batch 2.1.0.RC1</releaseinfo>
 
 		<authorgroup>
 			<author>