diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000000..c978a52dae
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,6 @@
+include AUTHORS
+include ChangeLog
+exclude .gitignore
+exclude .gitreview
+
+global-exclude *.pyc
diff --git a/setup.py b/setup.py
index c3cd0d7023..6643a127bd 100755
--- a/setup.py
+++ b/setup.py
@@ -31,6 +31,7 @@ setuptools.setup(
     packages=setuptools.find_packages(exclude=['bin']),
     include_package_data=True,
     test_suite='nose.collector',
+    setup_requires=['setuptools-git>=0.4'],
     scripts=['bin/ceilometer-agent-compute',
              'bin/ceilometer-agent-central',
              'bin/ceilometer-collector'],
diff --git a/tools/test-requires b/tools/test-requires
index f8f0760bc7..287e1800a3 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -12,3 +12,4 @@ python-glanceclient
 # github to make it easier to install, then ended up making some
 # changes to it so it would be compatible with PyMongo's API.
 https://github.com/dreamhost/Ming/zipball/master#egg=Ming
+setuptools-git>=0.4