diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e609f2775d..edb5fd6c20 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -64,6 +64,7 @@ Changelog
 * Fix: Multiple image uploader now escapes HTML in filenames (Mac Chapman)
 * Fix: Retrieving an individual item from a sliced BaseSearchResults object now properly takes the slice offset into account
 * Fix: Removed dependency on unicodecsv which fixes a crash on Python 3
+* Fix: Submitting unicode text in form builder form no longer crashes with UnicodeEncodeError on Python 2
 
 
 0.8.7 (29.04.2015)
diff --git a/docs/releases/0.8.8.rst b/docs/releases/0.8.8.rst
index 7666c7dab1..d431c1363d 100644
--- a/docs/releases/0.8.8.rst
+++ b/docs/releases/0.8.8.rst
@@ -17,3 +17,4 @@ Bug fixes
 * Multiple image uploader now escapes HTML in filenames
 * Retrieving an individual item from a sliced ``BaseSearchResults`` object now properly takes the slice offset into account
 * Removed dependency on unicodecsv which fixes a crash on Python 3
+* Submitting unicode text in form builder form no longer crashes with ``UnicodeEncodeError`` on Python 2