diff --git a/CHANGELOG b/CHANGELOG
index 33e04ed..a8e4ad1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+Version 1.2.35
+2016-02-10
+Avoid double URL decoding, reported by muyinliu (Hans Huebner)
+Remove a duplicate word in the documentation (William Halliburton)
+Call convert-hack in name also (José Ronquillo Rivera)
+
 Version 1.2.34
 2015-07-06
 decode URL considering content-type's charset (Tim Richardt)
diff --git a/hunchentoot.asd b/hunchentoot.asd
index 0b7c6ec..1bbe693 100644
--- a/hunchentoot.asd
+++ b/hunchentoot.asd
@@ -35,7 +35,7 @@
 
 (defsystem :hunchentoot
   :serial t
-  :version "1.2.34"
+  :version "1.2.35"
   :description "Hunchentoot is a HTTP server based on USOCKET and
   BORDEAUX-THREADS.  It supports HTTP 1.1, serves static files, has a
   simple framework for user-defined handlers and can be extended
diff --git a/www/hunchentoot-doc.html b/www/hunchentoot-doc.html
index 30b4689..925a4c4 100644
--- a/www/hunchentoot-doc.html
+++ b/www/hunchentoot-doc.html
@@ -164,7 +164,7 @@ <h3 xmlns=""><a class="none" name="install">Download and installation</a></h3>
       Hunchentoot itself together with this documentation can be
       downloaded from
       <a href="http://weitz.de/files/hunchentoot.tar.gz">http://weitz.de/files/hunchentoot.tar.gz</a>.
-      The current version is 1.2.34.
+      The current version is 1.2.35.
     </p>
     <p>
       The preferred method to compile and load Hunchentoot is via <a href="http://www.cliki.net/asdf">ASDF</a>.  If you want to avoid
@@ -2997,7 +2997,7 @@ <h4 xmlns=""><a name="conditions">Conditions and error handling</a></h4>
       </p>
       <p>
         When an error occurs while processing a request, Hunchentoot's
-        default behavior is to catch catch the error, log it and
+        default behavior is to catch the error, log it and
         optionally display it to the client in the HTML response.
         This behavior can be customized through the values of a number
         of special variables, which are documented below.