diff --git a/.hgignore b/.hgignore
index e6b00afec..3494863a4 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1 +1,4 @@
 .*\.pyc
+dist
+Sphinx.egg-info
+doc/_build
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 000000000..c468330d4
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,22 @@
+include README
+include LICENSE
+include AUTHORS
+include CHANGES
+include EXAMPLES
+include TODO
+
+include babel.cfg
+include Makefile
+include ez_setup.py
+include sphinx-build.py
+include sphinx-quickstart.py
+
+recursive-include sphinx/texinputs *.*
+recursive-include sphinx/templates *.html *.xml
+recursive-include sphinx/static *.*
+recursive-include sphinx/locale *.*
+recursive-include tests *.*
+recursive-include utils *.*
+
+recursive-include doc *.*
+prune doc/_build
diff --git a/setup.py b/setup.py
index e622bd13d..abe82198d 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ ez_setup.use_setuptools()
 
 import os
 import sys
-from setuptools import setup
+from setuptools import setup, find_packages
 from distutils import log
 
 import sphinx
@@ -172,7 +172,7 @@ setup(
         'Topic :: Utilities',
     ],
     platforms='any',
-    packages=['sphinx'],
+    packages=find_packages(),
     include_package_data=True,
     entry_points={
         'console_scripts': [