diff --git a/setup.cfg b/setup.cfg
index 8357a6c76..00a9b0888 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,6 +2,9 @@
 ignore = E124,E128,E129,E201,E202,E225,E226,E231,E265,E271,E302,E303,F401,E402,E501,W503,E731,F811,F821,F841
 exclude = cwltool/schemas
 
+[bdist_wheel]
+universal = 1
+
 [aliases]
 test=pytest
 
diff --git a/setup.py b/setup.py
index a2bf00f9a..9719e4e56 100755
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,8 @@
       author_email='common-workflow-language@googlegroups.com',
       url="https://github.com/common-workflow-language/cwltool",
       download_url="https://github.com/common-workflow-language/cwltool",
-      license='Apache 2.0',
+      # platforms='',  # empty as is conveyed by the classifier below
+      # license='',  # empty as is conveyed by the classifier below
       packages=["cwltool", 'cwltool.tests'],
       package_dir={'cwltool.tests': 'tests'},
       package_data={'cwltool': ['schemas/draft-2/*.yml',
@@ -74,8 +75,35 @@
       cmdclass={'egg_info': tagger},
       classifiers=[
           'Development Status :: 5 - Production/Stable',
+          'Environment :: Console',
+          'Intended Audience :: Developers',
+          'Intended Audience :: Science/Research',
+          'Intended Audience :: Healthcare Industry',
+          'License :: OSI Approved :: Apache Software License',
+          'Natural Language :: English',
+          'Operating System :: MacOS :: MacOS X',
           'Operating System :: POSIX',
+          'Operating System :: POSIX :: Linux',
           'Operating System :: OS Independent',
-          'Programming Language :: Python :: 2 :: Only',
+          # 'Operating System :: Microsoft :: Windows',  # soon!
+          # 'Operating System :: Microsoft :: Windows :: Windows 10',  # soon!
+          # 'Operating System :: Microsoft :: Windows :: Windows 8.1',  # soon!
+          # 'Operating System :: Microsoft :: Windows :: Windows 8',  # not tested
+          # 'Operating System :: Microsoft :: Windows :: Windows 7',  # not tested
+          'Programming Language :: Python :: 2',
+          'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: 3.3',
+          'Programming Language :: Python :: 3.4',
+          'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
+          'Topic :: Scientific/Engineering',
+          'Topic :: Scientific/Engineering :: Bio-Informatics',
+          'Topic :: Scientific/Engineering :: Astronomy',
+          'Topic :: Scientific/Engineering :: Atmospheric Science',
+          'Topic :: Scientific/Engineering :: Information Analysis',
+          'Topic :: Scientific/Engineering :: Medical Science Apps.',
+          'Topic :: System :: Distributed Computing',
+          'Topic :: Utilities',
       ]
       )