diff --git a/MANIFEST.in b/MANIFEST.in
index 15bfe4caac..48ec57edf7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
 include README.md
 include LICENSE.md
 recursive-include rest_framework/static *.js *.css *.png *.eot *.svg *.ttf *.woff
-recursive-include rest_framework/templates *.html
+recursive-include rest_framework/templates *.html schema.js
 global-exclude __pycache__
 global-exclude *.py[co]
diff --git a/setup.py b/setup.py
index 3854130528..736df7b129 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 import sys
 from io import open
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 try:
     from pypandoc import convert
@@ -28,31 +28,6 @@ def get_version(package):
     return re.search("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1)
 
 
-def get_packages(package):
-    """
-    Return root package and all sub-packages.
-    """
-    return [dirpath
-            for dirpath, dirnames, filenames in os.walk(package)
-            if os.path.exists(os.path.join(dirpath, '__init__.py'))]
-
-
-def get_package_data(package):
-    """
-    Return all files under the root package, that are not in a
-    package themselves.
-    """
-    walk = [(dirpath.replace(package + os.sep, '', 1), filenames)
-            for dirpath, dirnames, filenames in os.walk(package)
-            if not os.path.exists(os.path.join(dirpath, '__init__.py'))]
-
-    filepaths = []
-    for base, filenames in walk:
-        filepaths.extend([os.path.join(base, filename)
-                          for filename in filenames])
-    return {package: filepaths}
-
-
 version = get_version('rest_framework')
 
 
@@ -84,8 +59,8 @@ def get_package_data(package):
     long_description=read_md('README.md'),
     author='Tom Christie',
     author_email='tom@tomchristie.com',  # SEE NOTE BELOW (*)
-    packages=get_packages('rest_framework'),
-    package_data=get_package_data('rest_framework'),
+    packages=find_packages(exclude=['tests*']),
+    include_package_data=True,
     install_requires=[],
     zip_safe=False,
     classifiers=[