diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index 8ecd47cf..462c4b40 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,6 +1,13 @@
 Spring HATEOAS Changelog
 ========================
 
+Changes in version 0.21.0.RELEASE (2016-07-17)
+----------------------------------------------
+- #472 - Release 0.21.
+- #469 - Remove use of AnnotationMethodHandlerAdapter for Spring 5 compatibility.
+- #464 - Documentation for Traverson broken.
+- #460 - HalHandlerInstantiator should use a BeanFactory just like SpringHandlerInstantiator.
+
 Changes in version 0.20.0.RELEASE (2016-06-06)
 ----------------------------------------------
 - #458 - Release 0.20.
diff --git a/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java b/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java
index d2aa9362..fb914b0d 100644
--- a/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java
+++ b/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java
@@ -30,7 +30,7 @@ import com.jayway.jsonpath.JsonPath;
  */
 class ChangelogCreator {
 
-	private static final int MILESTONE_ID = 20;
+	private static final int MILESTONE_ID = 21;
 	private static final String URI_TEMPLATE = "https://api.github.com/repos/spring-projects/spring-hateoas/issues?milestone={id}&state=closed";
 
 	public static void main(String... args) throws Exception {