diff --git a/bumpr.rc b/bumpr.rc
new file mode 100644
index 00000000..cfc90fd7
--- /dev/null
+++ b/bumpr.rc
@@ -0,0 +1,30 @@
+[bumpr]
+file = pelican/__init__.py
+vcs = git
+clean =
+    python setup.py clean
+    rm -rf *egg-info build dist
+tests = tox
+publish = python setup.py sdist register upload
+files = README.rst
+
+[bump]
+unsuffix = true
+message = Bump version {version}
+
+[prepare]
+part = patch
+suffix = dev
+message = Prepare version {version} for next development cycle
+
+[changelog]
+file = docs/changelog.rst
+separator = =
+bump = {version} ({date:%Y-%m-%d})
+prepare = Next release
+
+[readthedoc]
+url = http://docs.getpelican.com/{tag}
+
+[commands]
+bump = sed -i "s/last_stable\s*=.*/last_stable = '{version}'/" docs/conf.py
diff --git a/dev_requirements.txt b/dev_requirements.txt
index fa2634a0..c90ac630 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -6,3 +6,6 @@ Markdown
 BeautifulSoup4
 lxml
 typogrify
+
+# To perform release
+bumpr==0.2.0
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 61cae1d9..27938d4d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,8 +1,8 @@
 Release history
 ###############
 
-3.3 (XXXX-XX-XX)
-================
+Next release
+============
 
 * Rename signals for better consistency (some plugins may need to be updated)
 * Move metadata extraction from generators to readers; metadata extraction no
diff --git a/docs/conf.py b/docs/conf.py
index 40de84c7..5ac81b9e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -4,18 +4,26 @@ import sys, os
 
 sys.path.append(os.path.abspath(os.pardir))
 
-from pelican import __version__, __major__
+from pelican import __version__
 
 # -- General configuration -----------------------------------------------------
 templates_path = ['_templates']
-extensions = ['sphinx.ext.autodoc',]
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.ifconfig', 'sphinx.ext.extlinks']
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'Pelican'
 copyright = '2010, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
-version = __version__
-release = __major__
+release = __version__
+version = '.'.join(release.split('.')[:1])
+last_stable = '3.2.2'
+rst_prolog = '''
+.. |last_stable| replace:: :pelican-doc:`{0}`
+'''.format(last_stable)
+
+extlinks = {
+    'pelican-doc':  ('http://docs.getpelican.com/%s/', '')
+}
 
 # -- Options for HTML output ---------------------------------------------------
 
diff --git a/docs/index.rst b/docs/index.rst
index 914c2a7e..eb8883ce 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,5 +1,14 @@
-Pelican
-=======
+Pelican |release|
+=================
+
+
+.. ifconfig:: release.endswith('.dev')
+
+    .. warning::
+
+        This documentation is for the version of Pelican currently under development.
+        Were you looking for version |last_stable| documentation?
+
 
 Pelican is a static site generator, written in Python_.
 
@@ -12,7 +21,7 @@ Pelican is a static site generator, written in Python_.
 Features
 --------
 
-Pelican currently supports:
+Pelican |version| currently supports:
 
 * Articles (e.g., blog posts) and pages (e.g., "About", "Projects", "Contact")
 * Comments, via an external service (Disqus). (Please note that while
diff --git a/pelican/__init__.py b/pelican/__init__.py
index f2bd2e07..cecab54b 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -22,10 +22,7 @@ from pelican.settings import read_settings
 from pelican.utils import clean_output_dir, folder_watcher, file_watcher
 from pelican.writers import Writer
 
-__major__ = 3
-__minor__ = 2
-__micro__ = 0
-__version__ = "{0}.{1}.{2}".format(__major__, __minor__, __micro__)
+__version__ = "3.2.3.dev"
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'