diff --git a/MANIFEST.in b/MANIFEST.in
index e6efa44d9..124299f37 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,14 @@
+include README.md
 include LICENSE
-include MANIFEST.in
+include NEWS
+include Snippets/*.py
+include Snippets/README.md
 include MetaTools/*.py
 include Lib/fontTools/ttLib/tables/table_API_readme.txt
+
+include *requirements.txt
+include tox.ini
+
+recursive-include Lib/fontTools *testdata/*.ttx *testdata/*.otx *testdata/*.fea
+recursive-include Lib/fontTools *testdata/*.lwfn *testdata/*.pfa *testdata/*.pfb
+recursive-include Lib/fontTools *testdata/*.xml *testdata/*.designspace
diff --git a/setup.py b/setup.py
index 32cf669bc..618b35504 100755
--- a/setup.py
+++ b/setup.py
@@ -53,19 +53,7 @@ setup(
 	packages=find_packages("Lib"),
 	py_modules=['sstruct', 'xmlWriter'],
 	extra_path='FontTools',
-	package_data={
-		'': [
-			# include files used by the test suite
-			'testdata/*.ttx',
-			'testdata/*.otx',
-			'testdata/*.fea',
-			'testdata/*.lwfn',
-			'testdata/*.pfa',
-			'testdata/*.pfb',
-			'testdata/*.xml',
-			'testdata/*.designspace',
-		]
-	},
+	include_package_data=True,
 	entry_points={
 		'console_scripts': [
 			"ttx = fontTools.ttx:main",