diff --git a/MANIFEST.in b/MANIFEST.in
index be3e95c4d816..b10dafc7b5d9 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
 include HACKING LICENSE run_tests.py run_tests.sh
 include README exercise_rsapi.py
-include ChangeLog MANIFEST.in pylintrc Authors
+include MANIFEST.in pylintrc Authors
 graft nova/CA
 graft doc
 graft smoketests
diff --git a/nova/version.py b/nova/version.py
index 06810df468f1..9a6563b80820 100644
--- a/nova/version.py
+++ b/nova/version.py
@@ -14,14 +14,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-try:
-    from nova.vcsversion import version_info
-except ImportError:
-    version_info = {'branch_nick': u'LOCALBRANCH',
-                    'revision_id': 'LOCALREVISION',
-                    'revno': 0}
-
-
 NOVA_VERSION = ['2012', '1']
 YEAR, COUNT = NOVA_VERSION
 FINAL = False   # This becomes true at Release Candidate time
@@ -39,7 +31,7 @@ def version_string():
 
 
 def vcs_version_string():
-    return '%s:%s' % (version_info['branch_nick'], version_info['revision_id'])
+    return 'LOCALBRANCH:LOCALREVISION'
 
 
 def version_string_with_vcs():
diff --git a/run_tests.sh b/run_tests.sh
index 837f9695adf1..281cd8194624 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -114,7 +114,7 @@ function run_pep8 {
   #     as well.
   ${wrapper} pep8 --repeat --show-pep8 --show-source \
     --ignore=E202,W602 \
-    --exclude=vcsversion.py ${srcfiles}
+    ${srcfiles}
 }
 
 NOSETESTS="python run_tests.py $noseopts $noseargs"