diff --git a/setup.cfg b/setup.cfg
index 01378d84..d509ed40 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,3 +5,6 @@ tag_build = .dev0
 #universal = 1
 #python-tag = py3
 #plat-name = manylinux1_x86_64
+
+[sdist]
+#formats=zip,gztar
diff --git a/setup.py b/setup.py
index 12297183..7d502533 100644
--- a/setup.py
+++ b/setup.py
@@ -37,13 +37,13 @@
     for line in meta_fh:
         if LONG_DOC:
             if line.startswith(DOC_STOP):
-                LONG_DOC += DOC_STOP.rstrip()
+                LONG_DOC = LONG_DOC.strip().strip("'").strip('"').lstrip()
                 break
             else:
                 LONG_DOC += line
         elif line.startswith('__doc__'):
             DOC_STOP = line.split(' = ')[-1]
-            LONG_DOC += DOC_STOP
+            LONG_DOC = "\n"
     meta['LONG_DOC'] = LONG_DOC
 finally:
     meta_fh.close()
@@ -79,21 +79,29 @@
     platforms = ['Linux', 'Windows', 'Mac'],
     url = 'https://github.com/uqfoundation/dill',
     download_url = 'https://pypi.org/project/dill/#files',
+    project_urls = {
+        'Documentation':'http://dill.rtfd.io',
+        'Source Code':'https://github.com/uqfoundation/dill',
+        'Bug Tracker':'https://github.com/uqfoundation/dill/issues',
+    },
     python_requires = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.6.*',
-    classifiers = ['Development Status :: 5 - Production/Stable',
-                   'Intended Audience :: Developers',
-                   'Intended Audience :: Science/Research',
-                   'License :: OSI Approved :: BSD License',
-                   'Programming Language :: Python :: 2',
-                   'Programming Language :: Python :: 2.7',
-                   'Programming Language :: Python :: 3',
-                   'Programming Language :: Python :: 3.7',
-                   'Programming Language :: Python :: 3.8',
-                   'Programming Language :: Python :: 3.9',
-                   'Programming Language :: Python :: 3.10',
-                   'Programming Language :: Python :: Implementation :: PyPy',
-                   'Topic :: Scientific/Engineering',
-                   'Topic :: Software Development'],
+    classifiers = [
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Science/Research',
+        'License :: OSI Approved :: BSD License',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
+        'Topic :: Scientific/Engineering',
+        'Topic :: Software Development',
+    ],
     packages = ['dill','dill.tests'],
     package_dir = {'dill':'dill', 'dill.tests':'tests'},
     scripts=['scripts/undill','scripts/get_objgraph'],