diff --git a/setup.py b/setup.py
index bf2ee07ff..bd6f201d4 100644
--- a/setup.py
+++ b/setup.py
@@ -67,7 +67,13 @@ setup(
     docker-compose=compose.cli.main:main
     """,
     classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: Apache Software License',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
     ],
 )