diff --git a/setup.py b/setup.py
index 5ae22d6a93..0a32956eca 100644
--- a/setup.py
+++ b/setup.py
@@ -31,6 +31,16 @@ setuptools.setup(name='nova',
       author='OpenStack',
       author_email='nova@lists.launchpad.net',
       url='http://www.openstack.org/',
+      classifiers=[
+          'Environment :: OpenStack',
+          'Intended Audience :: Information Technology',
+          'Intended Audience :: System Administrators',
+          'License :: OSI Approved :: Apache Software License',
+          'Operating System :: POSIX :: Linux',
+          'Programming Language :: Python',
+          'Programming Language :: Python :: 2',
+          'Programming Language :: Python :: 2.7',
+          ],
       cmdclass=common_setup.get_cmdclass(),
       packages=setuptools.find_packages(exclude=['bin', 'smoketests']),
       install_requires=requires,