diff --git a/MANIFEST.in b/MANIFEST.in
index 9050a42461cd..050ca7e0ea30 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,51 +1,6 @@
-include HACKING.rst
-include LICENSE run_tests.sh
-include README.rst
-include MANIFEST.in pylintrc Authors
-include openstack-common.conf
-include babel.cfg tox.ini
+include Authors
 include ChangeLog
-graft nova/CA
-graft doc
-graft smoketests
-graft tools
-graft etc
-graft contrib
-graft plugins
-graft nova/api/openstack/*/schemas
-include nova/auth/*.schema
-include nova/auth/novarc.template
-include nova/auth/opendj.sh
-include nova/auth/slap.sh
-include nova/cloudpipe/bootscript.sh
-include nova/cloudpipe/client.ovpn.template
-include nova/cloudpipe/bootscript.template
-include nova/compute/fakevirtinstance.xml
-include nova/compute/interfaces.template
-include nova/console/xvp.conf.template
-include nova/db/sqlalchemy/migrate_repo/migrate.cfg
-include nova/db/sqlalchemy/migrate_repo/README
-include nova/db/sqlalchemy/migrate_repo/versions/*.sql
-include nova/openstack/common/README
-include nova/virt/interfaces.template
-include nova/testing/README.rst
-include nova/tests/CA/
-include nova/tests/CA/cacert.pem
-include nova/tests/CA/private/
-include nova/tests/CA/private/cakey.pem
-include nova/tests/bundle/
-include nova/tests/bundle/1mb.manifest.xml
-include nova/tests/bundle/1mb.no_kernel_or_ramdisk.manifest.xml
-include nova/tests/bundle/1mb.part.0
-include nova/tests/bundle/1mb.part.1
-include nova/tests/api/ec2/public_key/*
-include nova/tests/image/*.tar.gz
-include nova/tests/policy.json
-include nova/tests/test_migrations.conf
-include nova/tests/xenapi/vm_rrd.xml
-include plugins/xenapi/README
-include plugins/xenapi/etc/xapi.d/plugins/objectstore
-include plugins/xenapi/etc/xapi.d/plugins/pluginlib_nova.py
-global-exclude *.pyc
+exclude .gitignore
+exclude .gitreview
 
-recursive-include nova/locale *
+global-exclude *.pyc
diff --git a/setup.py b/setup.py
index 37988acf721c..0f71ec2e8b8c 100644
--- a/setup.py
+++ b/setup.py
@@ -72,6 +72,7 @@ setuptools.setup(name='nova',
       packages=setuptools.find_packages(exclude=['bin', 'smoketests']),
       include_package_data=True,
       test_suite='nose.collector',
+      setup_requires=['setuptools_git>=0.4'],
       scripts=['bin/nova-all',
                'bin/nova-api',
                'bin/nova-api-ec2',
diff --git a/tools/pip-requires b/tools/pip-requires
index 49c96051a68e..234c31a7bb09 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -23,3 +23,4 @@ pycrypto
 Babel>=0.9.6
 iso8601>=0.1.4
 httplib2
+setuptools_git>=0.4
diff --git a/tox.ini b/tox.ini
index 49d21860058f..08aa9686ac4b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ downloadcache = ~/cache/pip
 
 [testenv:pep8]
 deps = pep8==1.1
-commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc .
+commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc,*egg .
 
 [testenv:cover]
 setenv = NOSE_WITH_COVERAGE=1