diff --git a/CHANGES.rst b/CHANGES.rst
index a8ce4bc5..7a186c4b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,16 @@
 CHANGELOG
 =========
 
+0.6.36 (2017-09-15)
+-------------------
+
+* Fix user field rendering when no person associated
+
+* Add generic support for downloading list results as CSV
+
+* Tweak title for master view row template
+
+
 0.6.35 (2017-08-30)
 -------------------
 
diff --git a/tailbone/_version.py b/tailbone/_version.py
index 8d5bba94..58fd4a36 100644
--- a/tailbone/_version.py
+++ b/tailbone/_version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8; -*-
 
-__version__ = '0.6.35'
+__version__ = '0.6.36'