diff --git a/MANIFEST.in b/MANIFEST.in
index ebfbac1..e5d9c7f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,7 +6,7 @@ include LICENSE.txt
 
 recursive-include categories *.html *.txt *.json *.html
 
-recursive-include editor  *.html *.txt *.json *.html *.gif *.png *.css *.js
+recursive-include editor *.html *.gif *.png *.css *.js
 
 recursive-include doc_src *.rst *.txt *.png *.css *.html *.js
 include doc_src/Makefile
diff --git a/setup.py b/setup.py
index 4b276dd..a49f8f1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from setuptools import setup
+from setuptools import setup, find_packages
 import categories
 import os
 
@@ -19,8 +19,9 @@ setup(
     long_description=long_description,
     author='Corey Oordt',
     author_email='coordt@washingtontimes.com',
+    include_package_data=True,
     url='http://opensource.washingtontimes.com/projects/django-categories/',
-    packages=['categories', 'editor'],
+    packages=find_packages(),
     classifiers=[
         'Development Status :: 4 - Beta',
         'Framework :: Django',