diff --git a/AUTHORS.rst b/AUTHORS.rst
index 203b44e..c6cd4e7 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -7,15 +7,15 @@ This version would not exist without the contributions from the
 Contributors
 ------------
 -   |theevocater|_
-    
+
     *   Fixed Authors link in README
 
 -   |tcheneau|_
-    
+
     *   Added support for AsciiDoc.
 
 -   |gr3dman|_
-    
+
     *   Added paginator plugin and tests
 
 -   |benallard|_
@@ -25,7 +25,7 @@ Contributors
     *   Added traceback support for errors when server is running
 
 -   |stiell|_
-    
+
     *   Bug Fix: Better mime type support in hyde server
     *   Bug Fix: Support empty extension in tagger archives
 
@@ -34,9 +34,10 @@ Contributors
     *   Bug Fix: Hyde server now takes the url cleaner plugin into account.
     *   Bug Fix: Sorter excludes items that do not have sorting attributes.
     *   Bug Fix: CLTransformer now gracefully handles arguments that have "=".
+    *   Bug Fix: All occurrences of `str` replaced with `unicode`.
 
 -   |merlinrebrovic|_
-    
+
     * Hyde starter kit
 
 -   |vincentbernat|_
@@ -64,7 +65,7 @@ Contributors
     *   Added PyPI publisher
     *   Bug fix: Made `site.full_url` ignore fully qualified paths
     *   Added Sphinx Plugin
-    *   Bug fix: PyFS publisher now checks if the pyfs module is installed. 
+    *   Bug fix: PyFS publisher now checks if the pyfs module is installed.
 
 -   |tinnet|_
 
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ca643fc..6acd9e6 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,10 @@
+Version 0.8.4c10
+================
+
+Thanks to @gfuchedzhy
+
+*   Bug Fix: All occurrences of `str` replaced with `unicode`. (Issue #87)
+
 Version 0.8.4c9
 ===============
 
@@ -5,7 +12,7 @@ Version 0.8.4c9
 
 Thanks to @merlinrebrovic
 
-*   Hyde Starter Kit patches.
+*   Hyde Starter Kit patches. (Issue #68)
 
 Version 0.8.4c8
 ===============
@@ -18,21 +25,21 @@ Version 0.8.4c7
 
 Thanks to @tcheneau
 
-*   Added support for AsciiDoc.
+*   Added support for AsciiDoc. (Issue #76)
 
 Version 0.8.4c6
 ===============
 
 Thanks to @gr3dman
 
-*   Added paginator plugin and tests
+*   Added paginator plugin and tests (Issue #73)
 
 Version 0.8.4c5
 ===============
 
 Thanks to @merlinrebrovic
 
-*   Hyde starter kit extended with advanced options
+*   Hyde starter kit extended with advanced options (Issue #68)
 
 Version 0.8.4c4
 ===============
@@ -41,9 +48,9 @@ Version 0.8.4c4
 
 Thanks to @benallard
 
-*   Added restructuredText plugin
-*   Added restructuredText filter
-*   Added traceback support for errors when server is running
+*   Added restructuredText plugin (Issue #63)
+*   Added restructuredText filter (Issue #63)
+*   Added traceback support for errors when server is running (Issue #63)
 
 Version 0.8.4c3
 ===============
@@ -55,15 +62,15 @@ Version 0.8.4c2
 
 Thanks to @rfk
 
-*   Added Sphinx Plugin
-*   Bug fix: PyFS publisher now checks if the pyfs module is installed.
+*   Added Sphinx Plugin (Issue #62)
+*   Bug fix: PyFS publisher now checks if the pyfs module is installed. (Issue #62)
 
 Version 0.8.4c1
 ================
 
 Thanks to @gfuchedzhy
 
-*   Bug Fix: CLTransformer now gracefully handles arguments that have "=".
+*   Bug Fix: CLTransformer now gracefully handles arguments that have "=". (Issue #58)
 
 Version 0.8.3
 ================