diff --git a/.gitignore b/.gitignore
index 458081f..a8a10d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,13 @@
-sshuttle/version.py
-docs/conf.py
+/sshuttle/version.py
+/docs/conf.py
+/tmp/
+/.cache/
+/.eggs/
+/.tox/
+/build/
+/dist/
+/sshuttle.egg-info/
+/docs/_build/
 *.pyc
 *~
 *.8
diff --git a/MANIFEST.in b/MANIFEST.in
index 1f5f573..71e7068 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,8 +6,10 @@ include LICENSE
 include run
 include tox.ini
 exclude sshuttle/version.py
+exclude docs/conf.py
 recursive-include docs *.bat
 recursive-include docs *.py
 recursive-include docs *.rst
 recursive-include docs Makefile
 recursive-include sshuttle *.py
+recursive-exclude docs/_build *