diff --git a/doc/source/conf.py b/doc/source/conf.py
index 20e9c88afc..368a686c3f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -64,7 +64,7 @@ from nova import version as nova_version
 # The full version, including alpha/beta/rc tags.
 release = nova_version.version()
 # The short X.Y version.
-version = nova_version.canonical_version()
+version = nova_version.canonical_version_string()
 
 # 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 2ccece7896..5b58274c63 100644
--- a/setup.py
+++ b/setup.py
@@ -58,7 +58,7 @@ class local_sdist(sdist):
         sdist.run(self)
 
 setup(name='nova',
-      version=version.canonical_version(),
+      version=version.canonical_version_string(),
       description='cloud computing fabric controller',
       author='OpenStack',
       author_email='nova@lists.launchpad.net',