diff --git a/.travis.yml b/.travis.yml
index 67f9ea3bdd9..b38c47c5a4f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,9 @@ install:
   - if [ "$TRAVIS_PYTHON_VERSION" == "3.2" ]; then travis_retry pip install coverage==3.7.1; fi
   - if [ "$TRAVIS_PYTHON_VERSION" != "3.2" ]; then travis_retry pip install coverage; fi
 
+  # clean checkout for manifest
+  - mkdir /tmp/check-manifest && cp -a . /tmp/check-manifest
+
   # webp
   - pushd depends && ./install_webp.sh && popd
 
@@ -47,7 +50,7 @@ script:
 
   - if [ "$TRAVIS_PYTHON_VERSION" != "nightly" ]; then coverage run --append --include=PIL/* selftest.py; fi
   - if [ "$TRAVIS_PYTHON_VERSION" != "nightly" ]; then coverage run --append --include=PIL/* -m nose -vx Tests/test_*.py; fi
-  - check-manifest --ignore "depends/*"
+  - pushd /tmp/check-manifest && check-manifest --ignore ".coveragerc,.editorconfig,*.yml,*.yaml,tox.ini" && popd
   # Sphinx
   - make install
   - pushd docs; make html; make linkcheck; popd
@@ -68,15 +71,15 @@ after_success:
 
   - travis_retry pip install pep8 pyflakes
   - pep8 --statistics --count PIL/*.py
-  - pep8  --statistics --count Tests/*.py
+  - pep8 --statistics --count Tests/*.py
   - pyflakes *.py       | tee >(wc -l)
   - pyflakes PIL/*.py   | tee >(wc -l)
   - pyflakes Tests/*.py | tee >(wc -l)
 
     # Coverage and quality reports on just the latest diff.
     # (Installation is very slow on Py3, so just do it for Py2.)
-  - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then Scripts/diffcover-install.sh; fi
-  - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then Scripts/diffcover-run.sh; fi
+  - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then depends/diffcover-install.sh; fi
+  - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then depends/diffcover-run.sh; fi
 
   # after_all
   - |
diff --git a/MANIFEST.in b/MANIFEST.in
index d82b746aa28..5476d49df83 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,85 +7,21 @@ include *.py
 include *.rst
 include *.sh
 include *.txt
-include *.yaml
-include *.yml
-include .coveragerc
-include .gitattributes
 include LICENSE
 include Makefile
-include tox.ini
-recursive-include PIL *.md
-recursive-include Scripts *.py
-recursive-include Scripts *.rst
-recursive-include Scripts *.sh
-recursive-include Tests *.bdf
-recursive-include Tests *.bin
-recursive-include Tests *.bmp
-recursive-include Tests *.bw
-recursive-include Tests *.cur
-recursive-include Tests *.dcx
-recursive-include Tests *.dds
-recursive-include Tests *.doc
-recursive-include Tests *.eps
-recursive-include Tests *.fli
-recursive-include Tests *.gbr
-recursive-include Tests *.ggr
-recursive-include Tests *.gif
-recursive-include Tests *.gpl
-recursive-include Tests *.gnuplot
-recursive-include Tests *.html
-recursive-include Tests *.icc
-recursive-include Tests *.icns
-recursive-include Tests *.ico
-recursive-include Tests *.im
-recursive-include Tests *.j2k
-recursive-include Tests *.jp2
-recursive-include Tests *.jpg
-recursive-include Tests *.lut
-recursive-include Tests *.mpo
-recursive-include Tests *.msp
-recursive-include Tests *.pbm
-recursive-include Tests *.pcf
-recursive-include Tests *.pcx
-recursive-include Tests *.pgm
-recursive-include Tests *.pil
-recursive-include Tests *.png
-recursive-include Tests *.ppm
-recursive-include Tests *.psd
-recursive-include Tests *.py
-recursive-include Tests *.ras
-recursive-include Tests *.rgb
-recursive-include Tests *.rst
-recursive-include Tests *.sgi
-recursive-include Tests *.spider
-recursive-include Tests *.tar
-recursive-include Tests *.tga
-recursive-include Tests *.tif
-recursive-include Tests *.tiff
-recursive-include Tests *.ttf
-recursive-include Tests *.txt
-recursive-include Tests *.webp
-recursive-include Tests *.xbm
-recursive-include Tests *.xpm
-recursive-include Tk *.c
-recursive-include Tk *.rst
-recursive-include depends *.rst
-recursive-include depends *.sh
-recursive-include docs *.bat
-recursive-include docs *.gitignore
-recursive-include docs *.html
-recursive-include docs *.py
-recursive-include docs *.rst
-recursive-include docs *.txt
-recursive-include docs Makefile
-recursive-include docs Guardfile
-recursive-include docs COPYING
-recursive-include docs BUILDME
-recursive-include libImaging *.c
-recursive-include libImaging *.h
-recursive-include winbuild *.gitignore
-recursive-include winbuild *.md
-recursive-include winbuild *.opt
-recursive-include winbuild *.py
-recursive-include winbuild *.rst
-exclude .editorconfig
+graft Scripts
+graft Tests
+graft PIL
+graft Tk
+graft libImaging
+graft depends
+graft winbuild
+graft docs
+prune docs/_static
+
+# build/src control detritus
+exclude build_children.sh
+global-exclude .git*
+global-exclude *.pyc
+global-exclude *.so
+
diff --git a/Scripts/diffcover-install.sh b/depends/diffcover-install.sh
similarity index 100%
rename from Scripts/diffcover-install.sh
rename to depends/diffcover-install.sh
diff --git a/Scripts/diffcover-run.sh b/depends/diffcover-run.sh
similarity index 100%
rename from Scripts/diffcover-run.sh
rename to depends/diffcover-run.sh