diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5122b8d1d..88d221100 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -9,6 +9,7 @@ Changelog
  * Renamed wagtailsearch.indexed to wagtailsearch.index
  * Fix: Page URL generation now returns correct URLs for sites that have the main 'serve' view rooted somewhere other than '/'
  * Fix: Search results in the page chooser now respect the page_type parameter on PageChooserPanel
+ * Fix: Rendition filenames are now prevented from going over 60 chars, even with a large focal_point_key
 
 0.5 (01.08.2014)
 ~~~~~~~~~~~~~~~~
diff --git a/docs/releases/0.6.rst b/docs/releases/0.6.rst
index a5fbad591..ebd97fc05 100644
--- a/docs/releases/0.6.rst
+++ b/docs/releases/0.6.rst
@@ -26,6 +26,7 @@ Bug fixes
 
  * Page URL generation now returns correct URLs for sites that have the main 'serve' view rooted somewhere other than '/'.
  * Search results in the page chooser now respect the page_type parameter on PageChooserPanel.
+ * Rendition filenames are now prevented from going over 60 chars, even with a large focal_point_key.
 
 Upgrade considerations
 ======================