diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3c9a4d6517..80c9ba2f09 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -7,6 +7,7 @@ Changelog
  * Page slugs now allow unicode on Django >= 1.9 (Behzad Nategh)
  * Image upload form in image chooser now performs client side validation so that the selected file is not lost in the submission (Jack Paine)
  * oEmbed URL for audioBoom was updated (Janneke Janssen)
+ * Fix: Email templates and document uploader now support custom `STATICFILES_STORAGE` (Jonny Scholes)
 
 
 1.5.2 (08.06.2016)
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index bd6b66ab67..4c5b9f82ef 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -1,5 +1,5 @@
 Authors
-================
+=======
 
 * Matthew Westcott (Torchbox) twitter: @gasmanic
 * David Cranwell (Torchbox) twitter: @davecranwell
@@ -140,6 +140,7 @@ Contributors
 * Stephen Rice
 * Behzad Nategh
 * Yann Fouillat (Gagaro)
+* Jonny Scholes
 
 Translators
 ===========
diff --git a/docs/releases/1.6.rst b/docs/releases/1.6.rst
index 077d76358b..e04de7f28c 100644
--- a/docs/releases/1.6.rst
+++ b/docs/releases/1.6.rst
@@ -22,6 +22,8 @@ Minor features
 Bug fixes
 ~~~~~~~~~
 
+ * Email templates and document uploader now support custom `STATICFILES_STORAGE` (Jonny Scholes)
+
 
 Upgrade considerations
 ======================