diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 44cd7ad69..066f17b50 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -52,6 +52,7 @@ Changelog
* Fix: wagtailfrontendcache no longer tries to purge pages that are not in a site
* Fix: The contents of
elements in the rich text editor were not being whitelisted
* Fix: Due to the above issue, embeds/images in a rich text field would sometimes be saved into the database in their editor representation
+* Fix: RoutablePage now prevents subpage_urls from being defined as a property, which would cause a memory leak
0.8.6 (10.03.2015)
diff --git a/docs/releases/0.8.7.rst b/docs/releases/0.8.7.rst
index 6c6dd5505..aa6491cec 100644
--- a/docs/releases/0.8.7.rst
+++ b/docs/releases/0.8.7.rst
@@ -15,3 +15,4 @@ Bug fixes
* ``wagtailfrontendcache`` no longer tries to purge pages that are not in a site
* The contents of ``
`` elements in the rich text editor were not being whitelisted
* Due to the above issue, embeds/images in a rich text field would sometimes be saved into the database in their editor representation
+* RoutablePage now prevents ``subpage_urls`` from being defined as a property, which would cause a memory leak