diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml
index ac3fd45c1..1901da813 100644
--- a/archetypes/simple-cli/pom.xml
+++ b/archetypes/simple-cli/pom.xml
@@ -14,7 +14,7 @@
     </description>
     <properties>
         <spring.framework.version>3.2.0.RELEASE</spring.framework.version>
-        <spring.batch.version>2.2.5.BUILD-SNAPSHOT</spring.batch.version>
+        <spring.batch.version>2.2.5.RELEASE</spring.batch.version>
         <dependency.locations.enabled>false</dependency.locations.enabled>
         <junit.version>4.10</junit.version>
         <compiler.target.version>1.6</compiler.target.version>
diff --git a/src/site/apt/downloads.apt b/src/site/apt/downloads.apt
index b87c130bb..5743d74d2 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.2.4.RELEASE>>, the latest snapshots are <<3.0.0.BUILD-SNAPSHOT>>.  The version 2.0.x and 1.x branches are now in maintenance (the last release was <<2.0.4.RELEASE>>).
+  The current GA release is <<2.2.5.RELEASE>>, the latest snapshots are <<3.0.0.BUILD-SNAPSHOT>>.  The version 2.0.x and 1.x branches are now in maintenance (the last release was <<2.0.4.RELEASE>>).
 
 For runtime concerns and a container for running a Job as a service see the {{{http://static.springframework.org/spring-batch-admin}Spring Batch Admin}} project and the {{{http://static.springframework.org/spring-batch-admin/getting-started.html}getting started}} link there.
 
@@ -41,7 +41,7 @@ Source code can also be browsed and downloaded at {{{http://github.com/SpringSou
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>spring-batch-core</artifactId>
-    <version>2.2.4.RELEASE</version>
+    <version>2.2.5.RELEASE</version>
 </dependency>
 +---------------
 
@@ -74,7 +74,7 @@ Source code can also be browsed and downloaded at {{{http://github.com/SpringSou
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>org.springframework.batch.core</artifactId>
-    <version>2.2.4.RELEASE</version>
+    <version>2.2.5.RELEASE</version>
 </dependency>
 +---------------
 
@@ -100,7 +100,7 @@ Source code can also be browsed and downloaded at {{{http://github.com/SpringSou
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>spring-batch-core</artifactId>
-    <version>2.2.4.RELEASE</version>
+    <version>2.2.5.RELEASE</version>
 </dependency>
 +---------------
 
@@ -124,7 +124,7 @@ Source code can also be browsed and downloaded at {{{http://github.com/SpringSou
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>org.springframework.batch.core</artifactId>
-    <version>2.2.4.RELEASE</version>
+    <version>2.2.5.RELEASE</version>
 </dependency>
 +---------------
 
diff --git a/src/site/apt/migration/2.2.4-2.2.5.apt b/src/site/apt/migration/2.2.4-2.2.5.apt
new file mode 100755
index 000000000..4813c0d8e
--- /dev/null
+++ b/src/site/apt/migration/2.2.4-2.2.5.apt
@@ -0,0 +1,19 @@
+Spring Batch 2.2.5 Release Notes
+
+* Improvement
+
+  * {{{http://jira.springsource.org/browse/BATCH-1980}[BATCH-1980]}} - Transaction timeout results in step execution status UNKNOWN
+
+* Bug
+
+  * {{{http://jira.springsource.org/browse/BATCH-2153}[BATCH-2153]}} - StepSynchronizationManager uses static HashMap - NullPointerException with multiple Threads
+
+  * {{{http://jira.springsource.org/browse/BATCH-2169}[BATCH-2169]}} - @BeforeStep doesn't work when using @StepScope
+
+* Task
+
+  * {{{http://jira.springsource.org/browse/BATCH-2173}[BATCH-2173]}} - Update POM files to reference new repository URLs
+
+  * {{{http://jira.springsource.org/browse/BATCH-2180}[BATCH-2180]}} - Clarify: CompositeItemWriter and the need to register streams
+
+  * {{{http://jira.springsource.org/browse/BATCH-2181}[BATCH-2181]}} - Backport BATCH-2175 to the 2.2.x branch
diff --git a/src/site/apt/migration/index.apt b/src/site/apt/migration/index.apt
index e23d9dfcb..31f65f4f4 100644
--- a/src/site/apt/migration/index.apt
+++ b/src/site/apt/migration/index.apt
@@ -13,6 +13,8 @@
 
   Links:
 
+    * {{{./2.2.4-2.2.5.html}2.2.4-2.2.5}}
+
     * {{{./2.2.3-2.2.4.html}2.2.3-2.2.4}}
 
     * {{{./2.2.2-2.2.3.html}2.2.2-2.2.3}}
diff --git a/src/site/docbook/reference/index.xml b/src/site/docbook/reference/index.xml
index a36a70aea..4374272f0 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.2.4.RELEASE</releaseinfo>
+		<releaseinfo>Spring Batch 2.2.5.RELEASE</releaseinfo>
 
 		<authorgroup>
 			<author>