diff --git a/heatclient/version.py b/heatclient/version.py
index a9498ad1..7aafb43c 100644
--- a/heatclient/version.py
+++ b/heatclient/version.py
@@ -15,5 +15,8 @@
 
 from heatclient.openstack.common import version as common_version
 
+NEXT_VERSION = '0.2.0'
+
 version_info = common_version.VersionInfo('heatclient',
+                                          pre_version=NEXT_VERSION,
                                           python_package='python-heatclient')
diff --git a/setup.cfg b/setup.cfg
index ff57e674..727e83e6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,3 +13,8 @@ all_files = 1
 
 [upload_sphinx]
 upload-dir = doc/build/html
+
+[egg_info]
+tag_build = dev
+tag_date = false
+tag_svn_revision = 0
diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index 9c29f63d..9de42010
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -14,6 +16,7 @@ import os
 import setuptools
 
 from heatclient.openstack.common import setup
+from heatclient.version import version_info as version
 
 
 def read(fname):
@@ -21,7 +24,7 @@ def read(fname):
 
 setuptools.setup(
     name="python-heatclient",
-    version=setup.get_post_version('heatclient'),
+    version=version.canonical_version_string(always=True),
     author='Heat API Developers',
     author_email='discuss@heat-api.org',
     description="Client library for Heat orchestration API",