diff --git a/__pkginfo__.py b/__pkginfo__.py
index 8de228d0..5ae5caf8 100644
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -16,6 +16,13 @@ classifiers =  ['Development Status :: 3 - Alpha',
                 'Intended Audience :: Developers',
                 'Operating System :: OS Independent',
                 'Programming Language :: Python',
+                'Programming Language :: Python :: 2',
+                'Programming Language :: Python :: 2.6',
+                'Programming Language :: Python :: 2.7',
+                'Programming Language :: Python :: 3',
+                'Programming Language :: Python :: 3.3',
+                'Programming Language :: Python :: 3.4',
+                'Programming Language :: Python :: 3.5',
                 'Topic :: Software Development :: Debuggers',
                 'Topic :: Software Development :: Libraries :: Python Modules',
                 ]
diff --git a/setup.cfg b/setup.cfg
index 92f2e50b..2d65a879 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,3 +6,6 @@ doc_files = README
 #		USAGE.txt
 #		doc/
 #		examples/
+
+[bdist_wheel]
+universal=1
diff --git a/setup.py b/setup.py
index 3c235bad..1e5365ea 100755
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,7 @@
-#! python
+#!/usr/bin/env python
 
 """Setup script for the 'uncompyle6' distribution."""
 
-from distutils.core import setup, Extension
-
 # Get the package information used in setup().
 # from __pkginfo__ import \
 #     author,           author_email,       classifiers,                    \