diff --git a/setup.py b/setup.py
index 513108f0d6a..60c7d73ffc2 100644
--- a/setup.py
+++ b/setup.py
@@ -26,6 +26,21 @@ setup(name='ansible',
       package_data={
          '': ['module_utils/*.ps1', 'modules/core/windows/*.ps1', 'modules/extras/windows/*.ps1'],
       },
+      classifiers=[
+          'Development Status :: 5 - Production/Stable',
+          'Environment :: Console',
+          'Intended Audience :: Developers',
+          'Intended Audience :: Information Technology',
+          'Intended Audience :: System Administrators',
+          'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
+          'Natural Language :: English',
+          'Operating System :: POSIX',
+          'Programming Language :: Python :: 2.6',
+          'Programming Language :: Python :: 2.7',
+          'Topic :: System :: Installation/Setup',
+          'Topic :: System :: Systems Administration',
+          'Topic :: Utilities',
+      ],
       scripts=[
          'bin/ansible',
          'bin/ansible-playbook',