diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index 4fe656ec..61292a46 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,6 +1,30 @@
 Spring Hateoas Changelog
 =========================
 
+Changes in version 0.6.0.RELEASE (2013-31-05)
+---------------------------------------------
+- #73 - ControllerLinkBuilder should allow pointing to unmapped controllers
+- #72 - AnnotationMappingDiscoverer should return polished mapping for root slash mapping
+- #70 - Fixed problem with Controllers having a path parameter on the class mapping
+- #64 - Add HAL support for PagedResources
+- #63 - HAL : Wrong rel name for embedded collections
+- #62 - Add support for vnd.error
+- #61 - Release 0.6
+
+Changes in version 0.5.0.RELEASE (2013-30-04)
+---------------------------------------------
+- #57 - Support formatting of @PathVariables
+- #56 - Improve fragment handling in LinkBuilderSupport
+- #54 - Add basic support for RFC5988 style link headers
+- #53 - Use slf4j for logging
+- #52 - Add SPI to let HandlerMethodArgumentResolver implementations contribute to URI building
+- #51 - Add LinkDiscoverer implementation for HAL
+- #50 - Add @EnableHypermediaSupport to default configuration
+- #48 - Make source encoding explicit in pom.xml
+- #39 - Fix for #26 Add support for request parameters to Link builder
+- #26 - Add support for request parameters to Link builder
+- #44 - Release 0.5
+
 Changes in version 0.4.0.RELEASE (2013-28-01)
 ---------------------------------------------
 - #18 - Added support to build links pointing to controller methods
@@ -15,14 +39,14 @@ Changes in version 0.4.0.RELEASE (2013-28-01)
 
 Changes in version 0.3.0.RELEASE (2012-10-09)
 ---------------------------------------------
-#15 - Upgraded to Jackson 1.9.10.
-#14 - Added integration test to make sure default (de)serialization works
-#13 - Added LinkBuilder implementation that inspects JAX-RS @Path annotations 
-#12 - Introduced factories for LinkBuilder to improve client testability
-#11 - Moved to Set and back to List for Links inside ResourceSupport
-#10 - Renamed (Paged)Resources.fromEntities(…) to ….wrap(…) 
-#9 - Added constructor to PagedResources to take an Iterable of Links
-#7 - Excluded getId() of ResourceSupport from default JSON rendering
+- #15 - Upgraded to Jackson 1.9.10
+- #14 - Added integration test to make sure default (de)serialization works
+- #13 - Added LinkBuilder implementation that inspects JAX-RS @Path annotations
+- #12 - Introduced factories for LinkBuilder to improve client testability
+- #11 - Moved to Set and back to List for Links inside ResourceSupport
+- #10 - Renamed (Paged)Resources.fromEntities(…) to ….wrap(…)
+- #9 - Added constructor to PagedResources to take an Iterable of Links
+- #7 - Excluded getId() of ResourceSupport from default JSON rendering
 - Switched from Collection to Iterable in constructor of Resources 
 - Moved from ResourceEnricher to ResourceProcessor to allow manipulating the resource instance
 
diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt
index 8ded958d..a653db46 100644
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,5 +1,5 @@
-Spring Hateoas 0.4
-Copyright (c) [2012] SpringSource, a division of VMware, Inc.
+Spring Hateoas 0.6
+Copyright (c) [2012-2013] SpringSource, a division of VMware, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").  
 You may not use this product except in compliance with the License.  
diff --git a/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java b/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java
new file mode 100644
index 00000000..b2739ea8
--- /dev/null
+++ b/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.hateoas.support;
+
+import java.util.Iterator;
+
+import net.minidev.json.JSONArray;
+
+import org.springframework.web.client.RestTemplate;
+
+import com.jayway.jsonpath.JsonPath;
+
+/**
+ * Little helper to build a changelog from the tickets of a particular milestone.
+ * 
+ * @author Oliver Gierke
+ */
+class ChangelogCreator {
+
+	private static final int MILESTONE_ID = 6;
+	private static final String URI_TEMPLATE = "https://api.github.com/repos/SpringSource/spring-hateoas/issues?milestone={id}&state=closed";
+
+	public static void main(String... args) throws Exception {
+
+		RestTemplate template = new RestTemplate();
+		String response = template.getForObject(URI_TEMPLATE, String.class, MILESTONE_ID);
+
+		JsonPath titlePath = JsonPath.compile("$[*].title");
+		JsonPath idPath = JsonPath.compile("$[*].number");
+
+		JSONArray titles = titlePath.read(response);
+		Iterator<Object> ids = ((JSONArray) idPath.read(response)).iterator();
+
+		System.out.println("Milestone - " + JsonPath.read(response, "$[1].milestone.title"));
+
+		for (Object title : titles) {
+			System.out.println(String.format("- #%s - %s", ids.next(), title));
+		}
+	}
+}