diff --git a/.gitignore b/.gitignore
index f821dc56..2631c631 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ test_elasticsearch/cover
 docs/_build
 elasticsearch.egg-info
 .tox
+dist
 *.egg
 coverage.xml
 nosetests.xml
diff --git a/MANIFEST.in b/MANIFEST.in
index b6795522..7c3372f9 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,9 +3,14 @@ include LICENSE
 include MANIFEST.in
 include README.rst
 include README
-include dev_requirements.txt
-include requirements.txt
+include tox.ini
+include setup.py
 recursive-include docs *
 recursive-include test_elasticsearch *
 
+recursive-exclude docs/_build *
+recursive-exclude test_elasticsearch/rest-api-spec *
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
+
 global-exclude .coverage