diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,9 @@
+include LICENSE
+include MANIFEST.in
+include README.rst
+recursive-include conntrackt/static *
+recursive-include conntrackt/templates *
+recursive-include docs *
+recursive-include requirements *
+recursive-exclude * *.py[co]
+recursive-exclude docs/_build
\ No newline at end of file
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 import os
-from setuptools import setup
+from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
 README = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
@@ -12,9 +12,9 @@ os.chdir(os.path.normpath(os.path.join(o
 setup(
     name='django-conntrackt',
     version='0.1',
-    packages=['conntrackt'],
+    packages=find_packages(exclude=["projtest", "projtest.*"]),
     include_package_data=True,
-    license='GPLv3',  # example license
+    license='GPLv3+',
     description='A simple application for tracking connection requirements between different entities in a network.',
     long_description=README,
     url='http://projects.majic.rs/conntrackt',
@@ -23,14 +23,15 @@ setup(
     install_requires=INSTALL_REQUIREMENTS,
     tests_require=TEST_REQUIREMENTS,
     classifiers=[
+        'Development Status :: 4 - Beta',
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: GPLv3',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)'
         'Operating System :: OS Independent',
-        'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
+        'Topic :: System :: Networking :: Firewalls',
     ],
 )