diff --git a/MANIFEST.in b/MANIFEST.in
index bd3bec5689..04436bf1df 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,36 @@
-include readme.rst
+include CMakeLists.txt
+include LICENSE
+include schemas.xml
+include tox.ini
 include openmc/data/reconstruct.pyx
+include docs/source/_templates/layout.html
+include docs/sphinxext/LICENSE
+recursive-include . *.rst
+recursive-include cmake *.cmake
+recursive-include docs *.css
+recursive-include docs *.dia
+recursive-include docs *.png
+recursive-include docs *.py
+recursive-include docs *.svg
+recursive-include docs *.tex
+recursive-include docs *.txt
+recursive-include docs Makefile
+recursive-include examples *.h5
+recursive-include examples *.ipynb
+recursive-include examples *.png
+recursive-include examples *.py
+recursive-include examples *.xml
+recursive-include man *.1
+recursive-include src *.F90
+recursive-include src *.c
+recursive-include src *.cc
+recursive-include src *.cpp
+recursive-include src *.h
+recursive-include src *.hpp
+recursive-include src *.rnc
+recursive-include src *.rng
+recursive-include tests *.dat
+recursive-include tests *.h5
+recursive-include tests *.py
+recursive-include tests *.xml
+prune docs/build
diff --git a/setup.py b/setup.py
index 8d482b8626..354098ea35 100755
--- a/setup.py
+++ b/setup.py
@@ -26,29 +26,36 @@ with open('openmc/__init__.py', 'r') as f:
 kwargs = {
     'name': 'openmc',
     'version': version,
-    'packages': ['openmc', 'openmc.capi', 'openmc.data', 'openmc.mgxs',
-                 'openmc.model', 'openmc.stats'],
+    'packages': find_packages(),
     'scripts': glob.glob('scripts/openmc-*'),
 
-          # Data files and librarries
-          'package_data': {
-              'openmc.capi': ['libopenmc.{}'.format(suffix)],
-              'openmc.data': ['mass.mas12', 'fission_Q_data_endfb71.h5']
-          },
+    # Data files and librarries
+    'package_data': {
+        'openmc.capi': ['libopenmc.{}'.format(suffix)],
+        'openmc.data': ['mass.mas12', 'fission_Q_data_endfb71.h5']
+    },
 
-          # Metadata
-          'author': 'Will Boyd',
+    # Metadata
+    'author': 'Will Boyd',
     'author_email': 'wbinventor@gmail.com',
     'description': 'OpenMC Python API',
     'url': 'https://github.com/mit-crpg/openmc',
     'classifiers': [
+        'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'Intended Audience :: End Users/Desktop',
         'Intended Audience :: Science/Research',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
-        'Programming Language :: Python',
         'Topic :: Scientific/Engineering'
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
 
     # Required dependencies