diff --git a/MANIFEST.in b/MANIFEST.in
index 8ebfed5..866941d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,4 +4,5 @@ include INSTALL
 include LICENSE
 include MANIFEST.in
 include README.md
-recursive-include docs Makefile *.rst *.py
+recursive-include docs *.rst
+prune docs/_build
diff --git a/setup.py b/setup.py
index 3f30a0e..9d59adf 100644
--- a/setup.py
+++ b/setup.py
@@ -8,6 +8,8 @@
 if 'nosetests' in sys.argv[1:]:
     setup_requires.append('nose>=1.0')
 
+tests_require=['nose>=1.0']
+
 setup(
     name='iptools',
     version=__version__,
@@ -18,9 +20,10 @@
     download_url='http://pypi.python.org/packages/source/i/iptools/',
     license='BSD',
     platforms=['any', ],
-    packages=find_packages(),
+    packages=find_packages(exclude=['docs', 'tests', 'tests.*']),
     include_package_data=True,
-    test_suite='tests',
+    test_suite='nose.collector',
+    tests_require=tests_require,
     setup_requires=setup_requires,
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -37,10 +40,18 @@
         'Topic :: Utilities',
         'Topic :: Internet',
     ],
-    long_description="""Utilities for manipulating IPv4 and IPv6 addresses
-    including a class that can be used to include CIDR network blocks
-    in Django's INTERNAL_IPS setting.""",
+    keywords="ip2long long2ip django cidr ipv4 ipv6",
+    long_description="""
+    Utilities for manipulating IPv4 and IPv6 addresses including a
+    class that can be used to include CIDR network blocks in Django's
+    INTERNAL_IPS setting.
+    
+    Full documentation at http://python-iptools.readthedocs.org/
+    """,
     zip_safe=False,
+    extras_require={
+        'testing':tests_require,
+        },
 )
 
 # vim: set sw=4 ts=4 sts=4 et :