diff --git a/CHANGES.rst b/CHANGES.rst
index def0434..ab30310 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,15 @@
 Change Log
 ==========
 
+0.17.0
+------
+* Make the SQL for subscriptions much faster for PostgreSQL.
+* Repeatable builds using ye olde make.
+* Use tox test runner - no tests yet (#11).
+* Add concrete requirement files for test suite (#11).
+* Started documentation using Sphinx (#10).
+* Python 3 style exception handling.
+
 0.16.0
 ------
 * New setting: `DDP_API_ENDPOINT_DECORATORS`.
diff --git a/bumpversion.sh b/bumpversion.sh
index fa0e05a..9be02a3 100755
--- a/bumpversion.sh
+++ b/bumpversion.sh
@@ -1,3 +1,11 @@
 #!/bin/sh
+set -e
 cd "${0%/*}"
-cat setup.py | sed -e "s/version='[0123456789]\{1,\}\.[0123456789]\{1,\}\.[01234567989]\{1,\}'/version='$( git rev-parse --abbrev-ref HEAD | cut -d / -f 2 )'/" > setup.py
+OLD="$( python setup.py --version )"
+NEW="$( git rev-parse --abbrev-ref HEAD | cut -d / -f 2 )"
+echo "Bumping version ${OLD} -> ${NEW}...\n"
+sed -e "s/^    version='${OLD}'/    version='${NEW}'/" setup.py > .setup.py
+mv .setup.py setup.py
+sed -e "s/^version = '${OLD%.*}'/version = '${NEW%.*}'/" -e "s/^release = '${OLD}/release = '${NEW}'/" docs/conf.py > docs/.conf.py
+mv docs/.conf.py docs/conf.py
+git diff setup.py docs/conf.py
diff --git a/docs/conf.py b/docs/conf.py
index 4c58a44..06482b0 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -56,9 +56,9 @@ copyright = u'2015, Tyson Clugg'
 # built documents.
 #
 # The short X.Y version.
-version = '0.16'
+version = '0.17'
 # The full version, including alpha/beta/rc tags.
-release = '0.16.0'
+release = '0.17.0''
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index bb32f9b..050bd1f 100644
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ CLASSIFIERS = [
 
 setup(
     name='django-ddp',
-    version='0.16.0',
+    version='0.17.0',
     description=__doc__,
     long_description=open('README.rst').read(),
     author='Tyson Clugg',