diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 2e2977ab4..c60f672d2 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -34,6 +34,7 @@ Changelog
 * Fix: Storage backends that return raw ContentFile objects are now handled correctly when resizing images (@georgewhewell)
 * Fix: Punctuation characters are no longer stripped when performing search queries
 * Fix: When adding tags where there were none before, it is now possible to save a single tag with multiple words in it
+* Fix: richtext template tag no longer raises TypeError if None is passed into it (Alejandro Varas)
 
 0.8.4 (04.12.2014)
 ~~~~~~~~~~~~~~~~~~
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index d0c34417c..44992e71a 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -42,6 +42,7 @@ Contributors
 * georgewhewell
 * Frank Wiles
 * Sebastian Spiegel
+* Alejandro Varas
 
 Translators
 ===========
diff --git a/docs/releases/0.8.5.rst b/docs/releases/0.8.5.rst
index f75f93e60..482d660a0 100644
--- a/docs/releases/0.8.5.rst
+++ b/docs/releases/0.8.5.rst
@@ -20,3 +20,4 @@ Bug fixes
  * Storage backends that return raw ContentFile objects are now handled correctly when resizing images
  * Punctuation characters are no longer stripped when performing search queries
  * When adding tags where there were none before, it is now possible to save a single tag with multiple words in it
+ * ``richtext`` template tag no longer raises ``TypeError`` if ``None`` is passed into it