diff --git a/src/site/apt/downloads.apt b/src/site/apt/downloads.apt
index 67424edac..4f05b9a6e 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.6.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.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>>).
 
 * Zip Downloads
 
@@ -37,7 +37,7 @@ Spring Batch Downloads
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>spring-batch-core</artifactId>
-    <version>2.1.6.RELEASE</version>
+    <version>2.1.7.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.6.RELEASE</version>
+    <version>2.1.7.RELEASE</version>
 </dependency>
 +---------------
 
@@ -96,7 +96,7 @@ Spring Batch Downloads
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>spring-batch-core</artifactId>
-    <version>2.1.6.RELEASE</version>
+    <version>2.1.7.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.6.RELEASE</version>
+    <version>2.1.7.RELEASE</version>
 </dependency>
 +---------------
 
diff --git a/src/site/apt/migration/2.1.6-2.1.7.apt b/src/site/apt/migration/2.1.6-2.1.7.apt
new file mode 100644
index 000000000..505d009cb
--- /dev/null
+++ b/src/site/apt/migration/2.1.6-2.1.7.apt
@@ -0,0 +1,36 @@
+Spring Batch 2.1.7 Release Notes
+
+* Bug
+
+
+  * {{{https://jira.springframework.org/browse/BATCH-1705}[BATCH-1705]}} - CommandLineJobRunner fails if standard input not available
+
+  * {{{https://jira.springframework.org/browse/BATCH-1707}[BATCH-1707]}} - MapJobInstanceDao.getJobInstances(String jobName, int start, int count) does not work
+
+  * {{{https://jira.springframework.org/browse/BATCH-1709}[BATCH-1709]}} - BeanWrapperFieldSetMapper race condition in cache
+
+  * {{{https://jira.springframework.org/browse/BATCH-1712}[BATCH-1712]}} - Inline step definitions clash if multiple instances share a TaskExecutorPartitionHandler
+
+  * {{{https://jira.springframework.org/browse/BATCH-1717}[BATCH-1717]}} - Failure in RetryPolicy leads to infinite loop in Step
+
+* Improvement
+
+
+  * {{{https://jira.springframework.org/browse/BATCH-1693}[BATCH-1693]}} - Add RemoteStepExecutionAggregator to update step executions from the repository during partition processing
+
+  * {{{https://jira.springframework.org/browse/BATCH-1713}[BATCH-1713]}} - The step execution context is not deserialized by default and no API to do it effectively
+
+* New Feature
+
+
+  * {{{https://jira.springframework.org/browse/BATCH-1396}[BATCH-1396]}} - Late binding of commit-interval, retry-limit, skip-limit, e.g. bound from job parameters.
+
+  * {{{https://jira.springframework.org/browse/BATCH-1696}[BATCH-1696]}} - DelimitedLineTokenizer always trims the input data
+
+  * {{{https://jira.springframework.org/browse/BATCH-1708}[BATCH-1708]}} - Inefficient (and unnecessary?) locking in TaskletStep and CompositeItemStream
+
+* Refactoring
+
+
+  * {{{https://jira.springframework.org/browse/BATCH-1532}[BATCH-1532]}} - Use Spring 3.0 OXM instead of SWS 1.5
+
diff --git a/src/site/apt/migration/index.apt b/src/site/apt/migration/index.apt
index 886055413..60606646f 100644
--- a/src/site/apt/migration/index.apt
+++ b/src/site/apt/migration/index.apt
@@ -13,6 +13,8 @@
 
   Links:
 
+    * {{{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}}
 
     * {{{2.1.4-2.1.5.html}2.1.4 to 2.1.5}}
diff --git a/src/site/docbook/reference/index.xml b/src/site/docbook/reference/index.xml
index 162d649ab..e0ff3cf57 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.6</releaseinfo>
+		<releaseinfo>Spring Batch 2.1.7</releaseinfo>
 
 		<authorgroup>
 			<author>