diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b91c9430dc..f542243181 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -17,6 +17,7 @@ Changelog
  * Fix: 'wagtail start' command now works on Windows
  * Fix: The external image URL generator no longer stores generated images in Django's cache
  * Fix: Elasticsearch backend can now search querysets that have been filtered with an 'in' clause of a non-list type (such as a ValuesListQuerySet)
+ * Fix: Logic around the has_unpublished_changes flag has been fixed, to prevent issues with the 'View draft' button failing to show in some cases
 
 0.6 (11.09.2014)
 ~~~~~~~~~~~~~~~~
diff --git a/docs/releases/0.7.rst b/docs/releases/0.7.rst
index e0d7e18c9a..6c2fb10b19 100644
--- a/docs/releases/0.7.rst
+++ b/docs/releases/0.7.rst
@@ -39,6 +39,7 @@ Bug fixes
  * The 'wagtail start' command now works on Windows and other environments where the ``django-admin.py`` executable is not readily accessible.
  * The external image URL generator no longer stores generated images in Django's cache; this was an unintentional side-effect of setting cache control headers.
  * The Elasticsearch backend can now search querysets that have been filtered with an 'in' clause of a non-list type (such as a ``ValuesListQuerySet``).
+ * Logic around the ``has_unpublished_changes`` flag has been fixed, to prevent issues with the 'View draft' button failing to show in some cases.
 
 
 Upgrade considerations