diff --git a/CHANGES.rst b/CHANGES.rst
index 34a5789..2f4bb08 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,13 +4,31 @@ Changelog
 0.3.x
 ~~~~~
 
+Version 0.3.6
+-------------
+
+Released on Mar 24, 2016.
+
+- add compact protocol support, via `#159`_.
+- add option to force return bytes on response, via `#190`_.
+
+- bugfix for ssl socket can't be init without certfile and keyfile,
+  and add additional `capath` argument for SSLContext.  via `#186`_.
+- bugfix for set_timeout only works before socket open, via `#188`_.
+
+.. _`#159`: https://github.com/eleme/thriftpy/pull/159
+.. _`#186`: https://github.com/eleme/thriftpy/pull/186
+.. _`#188`: https://github.com/eleme/thriftpy/pull/188
+.. _`#190`: https://github.com/eleme/thriftpy/pull/190
+
+
 Version 0.3.5
 -------------
 
 Released on Feb 16, 2016.
 
 - fix another set_timeout backward compat issue introduced in last version.
-- make thrift container struct unhashable, via `#184`.
+- make thrift container struct unhashable, via `#184`_.
 
 .. _`#184`: https://github.com/eleme/thriftpy/pull/184
 
diff --git a/docs/conf.py b/docs/conf.py
index d6096bf..847f285 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,9 +53,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.3.5'
+version = '0.3.6'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.5'
+release = '0.3.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/thriftpy/__init__.py b/thriftpy/__init__.py
index a2229ea..6346446 100644
--- a/thriftpy/__init__.py
+++ b/thriftpy/__init__.py
@@ -5,7 +5,7 @@
 from .hook import install_import_hook, remove_import_hook
 from .parser import load, load_module, load_fp
 
-__version__ = '0.3.5'
+__version__ = '0.3.6'
 __python__ = sys.version_info
 __all__ = ["install_import_hook", "remove_import_hook",  "load", "load_module",
            "load_fp"]