diff --git a/setup.py b/setup.py
index 5518b56..77130a8 100755
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,10 @@
       author='Oliver Beckstein',
       author_email='orbeckst@gmail.com',
       url = 'https://github.com/Becksteinlab/numkit',
+      project_urls={'Documentation': 'https://numkit.readthedocs.org/',
+                    'Issue Tracker': 'https://github.com/Becksteinlab/numkit/issues',
+                    'Source': 'https://github.com/Becksteinlab/numkit',
+      },
       classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Console',
@@ -24,6 +28,14 @@
         'License :: OSI Approved :: BSD License',
         'Operating System :: POSIX',
         'Programming Language :: Python',
+        'Operating System :: MacOS :: MacOS X',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Scientific/Engineering',
         'Topic :: Software Development :: Libraries :: Python Modules',
         ],
@@ -32,6 +44,7 @@
       scripts=[],
       license='BSD',
       long_description=open('README.rst').read(),
+      long_description_content_type='text/x-rst',
       tests_require = ['numpy>=1.9', 'pytest'],
       install_requires=['numpy>=1.9', 'scipy>=1.0', 'six']
 )