diff --git a/setup.cfg b/setup.cfg
index fb632bb..f94d002 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,6 +32,12 @@ exclude =
     quarantine
     setupext
 
+[options.package_data]
+IPython.core = profile/README*
+IPython.core.tests = *.png, *.jpg, daft_extension/*.py
+IPython.lib.tests = *.wav
+IPython.testing.plugin = *.txt
+
 [options.entry_points]
 console_scripts =
     ipython = IPython:start_ipython
diff --git a/setup.py b/setup.py
index eb2a11f..ebff3fd 100755
--- a/setup.py
+++ b/setup.py
@@ -67,7 +67,6 @@ from setupbase import target_update
 
 from setupbase import (
     setup_args,
-    find_package_data,
     check_package_data_first,
     find_data_files,
     git_prebuild,
@@ -116,11 +115,8 @@ if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):
 # Find all the packages, package data, and data_files
 #---------------------------------------------------------------------------
 
-package_data = find_package_data()
-
 data_files = find_data_files()
 
-setup_args['package_data'] = package_data
 setup_args['data_files'] = data_files
 
 #---------------------------------------------------------------------------