diff --git a/MANIFEST.in b/MANIFEST.in
index 5476d49df..f6a1488f0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -20,8 +20,12 @@ graft docs
 prune docs/_static
 
 # build/src control detritus
+exclude .coveragerc
+exclude .editorconfig
+exclude .landscape.yaml
+exclude appveyor.yml
 exclude build_children.sh
+exclude tox.ini
 global-exclude .git*
 global-exclude *.pyc
 global-exclude *.so
-
diff --git a/Makefile b/Makefile
index 24b8c5f6b..148a70070 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,12 @@ clean:
 	rm -r build || true
 	find . -name __pycache__ | xargs rm -r || true
 
+BRANCHES=`git branch -a | grep -v HEAD | grep -v master | grep remote`
+co:
+	-for i in $(BRANCHES) ; do \
+        git checkout -t $$i ; \
+    done
+
 coverage: 
 	coverage erase
 	coverage run --parallel-mode --include=PIL/* selftest.py
@@ -33,6 +39,7 @@ help:
 	@echo "  inplace        make inplace extension" 
 	@echo "  install        make and install"
 	@echo "  install-req    install documentation and test dependencies"
+	@echo "  install-venv   install in virtualenv"
 	@echo "  release-test   run code and package tests before release"
 	@echo "  test           run tests on installed pillow"
 	@echo "  upload         build and upload sdists to PyPI" 
@@ -48,6 +55,10 @@ install:
 install-req:
 	pip install -r requirements.txt
 
+install-venv: 
+	virtualenv .
+	bin/pip install -r requirements.txt
+
 release-test:
 	$(MAKE) install-req
 	python setup.py develop
diff --git a/docs/requirements.txt b/docs/requirements.txt
deleted file mode 100644
index 6b104fb01..000000000
--- a/docs/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Sphinx
-sphinx-rtd-theme
diff --git a/requirements.txt b/requirements.txt
index 179635722..6a581002b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,25 @@
-# Testing and documentation requirements
+# Development, documentation & testing requirements.
 -e .
--r docs/requirements.txt
-coveralls
-nose
-nose-cov
-pep8
-pyflakes
-check-manifest
-pyroma
-jarn.viewdoc
+Babel==2.2.0
+Jinja2==2.8
+MarkupSafe==0.23
+Pygments==2.1.3
+Sphinx==1.3.6
+alabaster==0.7.7
+check-manifest==0.31
+cov-core==1.15.0
+coverage==4.0.3
+coveralls==1.1
+docopt==0.6.2
+docutils==0.12
+jarn.viewdoc==1.7
+nose-cov==1.6
+nose==1.3.7
+pep8==1.7.0
+pyflakes==1.1.0
+pyroma==2.0.2
+pytz==2016.2
+requests==2.9.1
+six==1.10.0
+snowballstemmer==1.2.1
+sphinx-rtd-theme==0.1.9