diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bc53b8931f..6517434962 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.6 (xx.xx.20xx)
+~~~~~~~~~~~~~~~~
+ * Fix: Page URL generation now returns correct URLs for sites that have the main 'serve' view rooted somewhere other than '/'
+
 0.5 (01.08.2014)
 ~~~~~~~~~~~~~~~~
  * Added multiple image uploader
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index df81741c9b..b69fdb539c 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -30,6 +30,7 @@ Contributors
 * Jeffrey Hearn
 * Robert Clark
 * Tim Heap
+* Nathan Brizendine
 
 Translators
 ===========
diff --git a/docs/releases/0.6.rst b/docs/releases/0.6.rst
new file mode 100644
index 0000000000..4b798cd5e7
--- /dev/null
+++ b/docs/releases/0.6.rst
@@ -0,0 +1,22 @@
+==========================================
+Wagtail 0.6 release notes - IN DEVELOPMENT
+==========================================
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+What's new
+==========
+
+Minor features
+~~~~~~~~~~~~~~
+
+Bug fixes
+~~~~~~~~~
+
+ * Page URL generation now returns correct URLs for sites that have the main 'serve' view rooted somewhere other than '/'.
+
+Upgrade considerations
+======================
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
index fbe12ecb2b..a9760c2392 100644
--- a/docs/releases/index.rst
+++ b/docs/releases/index.rst
@@ -5,6 +5,7 @@ Release notes
    :maxdepth: 1
 
    roadmap
+   0.6
    0.5
    0.4.1
    0.4