diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7bf766a4..7d385670 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,8 +1,8 @@
 Release history
 ###############
 
-Next release
-============
+3.6.0 (2015-06-15)
+==================
 
 * Disable caching by default in order to prevent potential confusion
 * Improve caching behavior, replacing ``pickle`` with ``cpickle``
diff --git a/docs/conf.py b/docs/conf.py
index 4ec0f832..43af8da4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,7 +18,7 @@ copyright = '2015, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 release = __version__
 version = '.'.join(release.split('.')[:1])
-last_stable = '3.3.0'
+last_stable = '3.6.0'
 rst_prolog = '''
 .. |last_stable| replace:: :pelican-doc:`{0}`
 '''.format(last_stable)
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 42c89bf0..f80c2ddb 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -26,7 +26,7 @@ from pelican.utils import (clean_output_dir, folder_watcher,
                            file_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
-__version__ = "3.5.0"
+__version__ = "3.6.0"
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 
diff --git a/setup.py b/setup.py
index 8e4eff34..37aca23f 100755
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
     name="pelican",
-    version="3.5.0",
+    version="3.6.0",
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',