diff --git a/MANIFEST.in b/MANIFEST.in
index ecc3b8b21..2e8cbc0b4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,10 +1,6 @@
 include AUTHORS
-include HACKING
-include LICENSE
-include README.rst
 include ChangeLog
-include run_tests.sh tox.ini
 include novaclient/versioninfo
-recursive-include doc *
-recursive-include tests *
-recursive-include tools *
+
+exclude .gitignore
+exclude .gitreview
diff --git a/setup.py b/setup.py
index f1e2b7b31..1fdbbc8d1 100644
--- a/setup.py
+++ b/setup.py
@@ -35,6 +35,8 @@ setuptools.setup(
     packages=setuptools.find_packages(exclude=['tests', 'tests.*']),
     install_requires=setup.parse_requirements(),
     cmdclass=setup.get_cmdclass(),
+    setup_requires=['setuptools_git>=0.4'],
+    include_package_data=True,
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Console",
diff --git a/tox.ini b/tox.ini
index 2c4ec427d..4d5dbdcb1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,7 @@ setenv = VIRTUAL_ENV={envdir}
 
 deps = -r{toxinidir}/tools/pip-requires
        -r{toxinidir}/tools/test-requires
+       setuptools_git>=0.4
 commands = python setup.py testr --testr-args='{posargs}'
 
 [testenv:pep8]