diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 000000000..c92364449
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,7 @@
+include AUTHORS
+include HACKING
+include LICENSE
+include README.rst
+include run_tests.sh
+recursive-include docs *
+recursive-include tests *
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 000000000..f7dc87f41
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,13 @@
+[nosetests]
+cover-package = novaclient
+cover-html = true
+cover-erase = true
+cover-inclusive = true
+
+[build_sphinx]
+source-dir = docs/
+build-dir = docs/_build
+all_files = 1
+
+[upload_sphinx]
+upload-dir = docs/_build/html