diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..3c6e79c
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1
diff --git a/setup.py b/setup.py
index bdbf133..7069e51 100644
--- a/setup.py
+++ b/setup.py
@@ -30,33 +30,39 @@ setup(
    name='pyvmomi',
    version='5.5.0-2014.1.1',
    description='VMware vSphere Python SDK',
+   # NOTE: pypi prefers the use of RST to render docs
+   long_description=read('README.rst'),
+   url='https://github.com/vmware/pyvmomi',
    author='VMware, Inc.',
    author_email='jhu@vmware.com',
-   url='https://github.com/vmware/pyvmomi',
    packages=['pyVmomi', 'pyVim'],
    install_requires=required,
    license='License :: OSI Approved :: Apache Software License',
-   data_files = [("", ["LICENSE.txt", "NOTICE.txt", "MANIFEST.in",
-                       "setup.py", "tox.ini"])],
-   # NOTE: pypi prefers the use of RST to render docs
-   long_description=read('README.rst'),
+   data_files = [('', ['LICENSE.txt', 'NOTICE.txt', 'MANIFEST.in',
+                       'setup.py', 'tox.ini', 'setup.cfg'])],
    classifiers=[
-      "License :: OSI Approved :: Apache Software License",
-      "Development Status :: 5 - Production/Stable",
-      "Environment :: No Input/Output (Daemon)",
-      "Programming Language :: Python",
-      "Programming Language :: Python :: 3",
-      "Intended Audience :: Information Technology",
-      "Intended Audience :: System Administrators",
-      "Intended Audience :: Developers",
-      "Topic :: Software Development :: Libraries :: Python Modules",
-      "Topic :: System :: Distributed Computing",
-      "Operating System :: Microsoft :: Windows",
-      "Operating System :: POSIX",
-      "Operating System :: Unix",
-      "Operating System :: MacOS",
+      'Development Status :: 5 - Production/Stable',
+      'License :: OSI Approved :: Apache Software License',
+      'Intended Audience :: Information Technology',
+      'Intended Audience :: System Administrators',
+      'Intended Audience :: Developers',
+      'Environment :: No Input/Output (Daemon)',
+      'Programming Language :: Python :: 2',
+      'Programming Language :: Python :: 2.6',
+      'Programming Language :: Python :: 2.7',
+      'Programming Language :: Python :: 3',
+      'Programming Language :: Python :: 3.2',
+      'Programming Language :: Python :: 3.3',
+      'Programming Language :: Python :: 3.4',      
+      'Topic :: Software Development :: Libraries :: Python Modules',
+      'Topic :: System :: Distributed Computing',
+      'Operating System :: Microsoft :: Windows',
+      'Operating System :: POSIX',
+      'Operating System :: Unix',
+      'Operating System :: MacOS',
    ],
-   platforms = ["Windows", "Linux", "Solaris", "Mac OS-X", "Unix"],
+   keywords='pyvmomi vsphere vmware esx',
+   platforms = ['Windows', 'Linux', 'Solaris', 'Mac OS-X', 'Unix'],
    test_suite='tests',
    tests_require= required_for_tests,
    zip_safe=True