diff --git a/src/site/apt/downloads.apt b/src/site/apt/downloads.apt
index faad1ea39..4a6f6ff5e 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.7.RELEASE>>, the latest snapshots are <<2.1.7.CI-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.1.8.RELEASE>>, the latest snapshots are <<2.2.0.BUILD-SNAPSHOT>>.  The version 2.0.x and 1.x branches are now in maintenance (the last release was <<2.0.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.7.RELEASE</version>
+    <version>2.1.8.RELEASE</version>
 </dependency>
 +---------------
 
@@ -70,7 +70,7 @@ Spring Batch Downloads
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>org.springframework.batch.core</artifactId>
-    <version>2.1.7.RELEASE</version>
+    <version>2.1.8.RELEASE</version>
 </dependency>
 +---------------
 
@@ -96,7 +96,7 @@ Spring Batch Downloads
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>spring-batch-core</artifactId>
-    <version>2.1.7.RELEASE</version>
+    <version>2.1.8.RELEASE</version>
 </dependency>
 +---------------
 
@@ -120,7 +120,7 @@ Spring Batch Downloads
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>org.springframework.batch.core</artifactId>
-    <version>2.1.7.RELEASE</version>
+    <version>2.1.8.RELEASE</version>
 </dependency>
 +---------------
 
diff --git a/src/site/apt/migration/2.1.7-2.1.8.apt b/src/site/apt/migration/2.1.7-2.1.8.apt
new file mode 100644
index 000000000..b719f761a
--- /dev/null
+++ b/src/site/apt/migration/2.1.7-2.1.8.apt
@@ -0,0 +1,39 @@
+Spring Batch 2.1.8 Release Notes
+
+
+* Bug
+
+  * {{{https://jira.springframework.org/browse/BATCH-1725}[BATCH-1725]}} - SubclassClassifier should use ConcurrentHashMap
+
+  * {{{https://jira.springframework.org/browse/BATCH-1727}[BATCH-1727]}} - Child contexts created by AutomaticJobRegistrar cannot easily use PropertyPlaceholderConfigurer
+
+  * {{{https://jira.springframework.org/browse/BATCH-1738}[BATCH-1738]}} - StaxEventItemReader stops reading when exception occurs during unmarshalling
+
+  * {{{https://jira.springframework.org/browse/BATCH-1739}[BATCH-1739]}} - Inheriting from parent step with skip-limit/retry-limit causes IllegalArgumentException when the inheriting bean doesn't define exception-classes.
+
+  * {{{https://jira.springframework.org/browse/BATCH-1742}[BATCH-1742]}} - HippyMethodInvoker fails when target uses method overloading and there is no exact match for arguments
+
+  * {{{https://jira.springframework.org/browse/BATCH-1743}[BATCH-1743]}} - Use step scope for PartitionHandler (so gridSize can be a job parameter) - broken in 2.1.7.
+
+  * {{{https://jira.springframework.org/browse/BATCH-1744}[BATCH-1744]}} - Revert retry-limit and skip-limit changes from BATCH-1396.
+
+* Improvement
+
+  * {{{https://jira.springframework.org/browse/BATCH-1316}[BATCH-1316]}} - JobParameters throws NullPointerException on missing key
+
+  * {{{https://jira.springframework.org/browse/BATCH-1719}[BATCH-1719]}} - The step execution context is not deserialized for getJobExecutions() and findRunningJobExecutions()
+
+  * {{{https://jira.springframework.org/browse/BATCH-1721}[BATCH-1721]}} - Replace + inside of StringBuilder.append() call in FlatFileItemWriter
+
+  * {{{https://jira.springframework.org/browse/BATCH-1722}[BATCH-1722]}} - ExecutionContextUserSupport refers to ItemStream in code and documentation
+
+  * {{{https://jira.springframework.org/browse/BATCH-1730}[BATCH-1730]}} - Flow based step cannot be repeated/ restarted within a partition
+
+* New Feature
+
+  * {{{https://jira.springframework.org/browse/BATCH-1737}[BATCH-1737]}} - DelimitedLineTokenizer. Specify which fields from a row you want to read
+
+* Pruning
+
+  * {{{https://jira.springframework.org/browse/BATCH-1741}[BATCH-1741]}} - Update javadoc for HibernateItemWriter
+
diff --git a/src/site/apt/migration/index.apt b/src/site/apt/migration/index.apt
index 60606646f..0d0ebc5c2 100644
--- a/src/site/apt/migration/index.apt
+++ b/src/site/apt/migration/index.apt
@@ -13,6 +13,8 @@
 
   Links:
 
+    * {{{2.1.7-2.1.8.html}2.1.7 to 2.1.8}}
+
     * {{{2.1.6-2.1.7.html}2.1.6 to 2.1.7}}
 
     * {{{2.1.5-2.1.6.html}2.1.5 to 2.1.6}}
diff --git a/src/site/apt/snapshots.apt b/src/site/apt/snapshots.apt
index defdc286b..22d609a2e 100644
--- a/src/site/apt/snapshots.apt
+++ b/src/site/apt/snapshots.apt
@@ -27,7 +27,7 @@ Snapshot Builds
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>spring-batch-core</artifactId>
-    <version>2.1.7.CI-SNAPSHOT</version>
+    <version>2.2.0.BUILD-SNAPSHOT</version>
 </dependency>
 +---------------
 
diff --git a/src/site/docbook/reference/index.xml b/src/site/docbook/reference/index.xml
index e0ff3cf57..81651b5fb 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.7</releaseinfo>
+		<releaseinfo>Spring Batch 2.1.8</releaseinfo>
 
 		<authorgroup>
 			<author>