diff --git a/INSTALL b/INSTALL
index cf9865d..780e285 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,7 +12,8 @@ Install
 Requirements
 ************
 
-`django-downloadview` has been tested with Python version 2.7, 3.3 and 3.4.
+`django-downloadview` has been tested with `Python`_ 2.7, 3.3 and 3.4. Other
+versions may work, but they are not part of the test suite at the moment.
 
 Installing `django-downloadview` will automatically trigger the installation of
 the following requirements:
@@ -83,6 +84,5 @@ You should get installed `django-downloadview`'s version.
 
 .. target-notes::
 
+.. _`Python`: https://www.python.org/
 .. _`pip`: https://pip.pypa.io/
-.. _`django-downloadview's bugtracker`:
-   https://github.com/benoitbryon/django-downloadview/issues
diff --git a/MANIFEST.in b/MANIFEST.in
index 452390b..d52c1c3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,9 @@
 recursive-include django_downloadview *
-global-exclude *.pyc .*.swp
-include *.txt
-include AUTHORS CHANGELOG CONTRIBUTING.rst INSTALL LICENSE README.rst VERSION
+global-exclude *.pyc
+include AUTHORS
+include CHANGELOG
+include CONTRIBUTING.rst
+include INSTALL
+include LICENSE
+include README.rst
+include VERSION
diff --git a/demo/demoproject/settings.py b/demo/demoproject/settings.py
index a5d9d1a..2d0b8e8 100755
--- a/demo/demoproject/settings.py
+++ b/demo/demoproject/settings.py
@@ -120,4 +120,5 @@ NOSE_ARGS = [
     '--nocapture',
     '--all-modules',
     '--with-coverage',
+    '--with-doctest',
 ]
diff --git a/demo/setup.py b/demo/setup.py
index 126e92e..ea1ce02 100644
--- a/demo/setup.py
+++ b/demo/setup.py
@@ -15,8 +15,8 @@ README = open(os.path.join(here, 'README.rst')).read()
 VERSION = open(os.path.join(project_root, 'VERSION')).read().strip()
 AUTHOR = u'Benoît Bryon'
 EMAIL = u'benoit@marmelune.net'
-URL = 'https://{name}.readthedocs.org/'.format(name=NAME)
-CLASSIFIERS = ['Development Status :: 4 - Beta',
+URL = 'https://django-downloadview.readthedocs.org/'
+CLASSIFIERS = ['Development Status :: 5 - Production/Stable',
                'License :: OSI Approved :: BSD License',
                'Programming Language :: Python :: 2.7',
                'Framework :: Django']
diff --git a/setup.py b/setup.py
index d7e924f..fdc3f3f 100644
--- a/setup.py
+++ b/setup.py
@@ -35,11 +35,14 @@ AUTHOR = u'Benoît Bryon'
 EMAIL = 'benoit@marmelune.net'
 LICENSE = 'BSD'
 URL = 'https://{name}.readthedocs.org/'.format(name=NAME)
-CLASSIFIERS = ['Development Status :: 5 - Production/Stable',
-               'License :: OSI Approved :: BSD License',
-               'Programming Language :: Python :: 2.7',
-               'Programming Language :: Python :: 3.3',
-               'Framework :: Django']
+CLASSIFIERS = [
+    'Development Status :: 5 - Production/Stable',
+    'Framework :: Django',
+    'License :: OSI Approved :: BSD License',
+    'Programming Language :: Python :: 2.7',
+    'Programming Language :: Python :: 3.3',
+    'Programming Language :: Python :: 3.4',
+]
 KEYWORDS = ['file',
             'stream',
             'download',