diff --git a/openstack-common.conf b/openstack-common.conf
index 93c65eb90..01723f04b 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
 # The list of modules to copy from openstack-common
-modules=cfg,context,eventlet_backdoor,exception,excutils,gettextutils,importutils,iniparser,jsonutils,local,log,loopingcall,network_utils,notifier,policy,rpc,service,setup,threadgroup,timeutils,uuidutils
+modules=cfg,context,eventlet_backdoor,exception,excutils,gettextutils,importutils,iniparser,jsonutils,local,log,loopingcall,network_utils,notifier,policy,rpc,service,setup,threadgroup,timeutils,uuidutils,version
 # The base module to hold the copy of openstack.common
 base=quantum
diff --git a/setup.py b/setup.py
index 3aa914355..7e410bfae 100644
--- a/setup.py
+++ b/setup.py
@@ -15,17 +15,14 @@
 import setuptools
 
 from quantum.openstack.common import setup
-
-setup.write_vcsversion('quantum/vcsversion.py')
-
-from quantum import version
+from quantum.version import version_info as version
 
 requires = setup.parse_requirements()
 depend_links = setup.parse_dependency_links()
 
 Name = 'quantum'
 Url = "https://launchpad.net/quantum"
-Version = version.canonical_version_string()
+Version = version.canonical_version_string(always=True)
 License = 'Apache License 2.0'
 Author = 'Netstack'
 AuthorEmail = 'netstack@lists.launchpad.net'