diff --git a/doc/__init__.py b/doc/__init__.py
deleted file mode 100644
index fdc958380b..0000000000
--- a/doc/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2011 OpenStack LLC.
-#
-# 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
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
\ No newline at end of file
diff --git a/doc/source/__init__.py b/doc/source/__init__.py
deleted file mode 100644
index fdc958380b..0000000000
--- a/doc/source/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2011 OpenStack LLC.
-#
-# 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
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
\ No newline at end of file
diff --git a/doc/source/conf.py b/doc/source/conf.py
index be53bcbfd2..ecf711e464 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -33,10 +33,9 @@ import sys
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.append([os.path.abspath('../quantum'),
-    os.path.abspath('..'),
-    os.path.abspath('../bin')
-    ])
+BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+QUANTUM_DIR = os.path.abspath(os.path.join(BASE_DIR, "..", ".."))
+sys.path.insert(0, QUANTUM_DIR)
 
 # -- General configuration ---------------------------------------------------
 
@@ -77,10 +76,10 @@ copyright = u'2011-present, OpenStack, LLC.'
 # built documents.
 #
 # Version info
-# TODO(salvatore-orlando): replace here once Bug #826563 is fixed
-release = '2012.1'
+from quantum import version as quantum_version
+release = quantum_version.version_string()
 # The short X.Y version.
-version = '2012.1'
+version = quantum_version.canonical_version_string()
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -246,4 +245,5 @@ intersphinx_mapping = {'python': ('http://docs.python.org/', None),
                        'swift': ('http://swift.openstack.org', None),
                        'glance': ('http://glance.openstack.org', None),
                        'horizon': ('http://horizon.openstack.org', None),
+                       'keystone': ('http://keystone.openstack.org', None),
                       }