diff --git a/docs/changelog.rst b/docs/changelog.rst
index baf4edd..f759e51 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,7 +5,7 @@ Changelog
 This changelog only contains information that might be useful to end users and
 package maintainers. For further info, see the git commit log.
 
-Version 0.1.6
+Version 0.2.0
 =============
 
 *unreleased*
diff --git a/setup.py b/setup.py
index 33ca6aa..f4b2810 100644
--- a/setup.py
+++ b/setup.py
@@ -9,12 +9,22 @@
     :copyright: (c) 2014 Markus Unterwaditzer & contributors
     :license: MIT, see LICENSE for more details.
 '''
-
+import ast
+import re
 from setuptools import setup, find_packages
 
+
+_version_re = re.compile(r'__version__\s+=\s+(.*)')
+
+
+with open('vdirsyncer/__init__.py', 'rb') as f:
+    version = str(ast.literal_eval(_version_re.search(
+        f.read().decode('utf-8')).group(1)))
+
+
 setup(
     name='vdirsyncer',
-    version='0.1.5',
+    version=version,
     author='Markus Unterwaditzer',
     author_email='markus@unterwaditzer.net',
     url='https://github.com/untitaker/vdirsyncer',
diff --git a/vdirsyncer/__init__.py b/vdirsyncer/__init__.py
index 3f0fbc5..51fa1e3 100644
--- a/vdirsyncer/__init__.py
+++ b/vdirsyncer/__init__.py
@@ -9,4 +9,4 @@
     :copyright: (c) 2014 Markus Unterwaditzer & contributors
     :license: MIT, see LICENSE for more details.
 '''
-__version__ = '0.1.5'
+__version__ = '0.2.0'