diff --git a/MANIFEST.in b/MANIFEST.in
index 75df5e1..78b9417 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,6 +3,7 @@ include CHANGELOG
 include README.rst
 include CONTRIBUTORS.rst
 include requirements.txt
+include requirements-base.txt
 recursive-exclude audit_tools.egg-info *
 recursive-exclude dist *
 recursive-exclude audit_tools/tests *
diff --git a/requirements-base.txt b/requirements-base.txt
new file mode 100644
index 0000000..70fc07b
--- /dev/null
+++ b/requirements-base.txt
@@ -0,0 +1,10 @@
+##########################################
+# Django Audit Tools - Requirements base #
+##########################################
+
+psutil>=2.1,<3.0
+mongoengine>=0.8,<1.0
+celery>=3.1,<4.0
+django-celery>=3.1,<4.0
+djangorestframework>=3.3,<4.0
+django-rest-framework-mongoengine>=3.3,<4.0
diff --git a/requirements-tests.txt b/requirements-tests.txt
index 5798414..e36b546 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -2,7 +2,7 @@
 # Django Audit Tools - Requirements for testing #
 #################################################
 
--r requirements.txt
+-r requirements-base.txt
 
 # Utils
 ipdb
diff --git a/requirements.txt b/requirements.txt
index fe7073f..305c363 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,7 @@
 #####################################
 # Django Audit Tools - Requirements #
 #####################################
-psutil>=2.1,<3.0
-mongoengine>=0.8,<1.0
-celery>=3.1,<4.0
-django-celery>=3.1,<4.0
-djangorestframework>=3.3,<4.0
-django-rest-framework-mongoengine>=3.3,<4.0
+
+-r requirements-base.txt
+
+Django>=1.7
diff --git a/setup.py b/setup.py
index e1699fc..3777041 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,13 @@
 
 from setuptools import setup
 from setuptools.command.test import test as TestCommand
+from pip.req import parse_requirements
+from pip.download import PipSession
 
 import audit_tools
 
-with open(os.path.join(os.path.dirname(__file__), 'requirements.txt'), 'r') as f:
-    requires = f.read().splitlines()
+requirements_file = os.path.join(os.path.dirname(__file__), 'requirements.txt')
+requires = [str(r.req) for r in parse_requirements(requirements_file, session=PipSession())]
 
 
 class Tox(TestCommand):
@@ -56,10 +58,9 @@ def run_tests(self):
         # Environment
         'Environment :: Web Environment',
         # Intended Audience:
-        'Intended Audience :: Support',
+        'Intended Audience :: Developers',
         'Intended Audience :: Information Technology',
         'Intended Audience :: System Administrators',
-        'Intended Audience :: Telecommunications Industry',
         # License
         'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',
         # Natural Language