diff --git a/acme/setup.py b/acme/setup.py
index f3afe97c3..4651ef5c2 100644
--- a/acme/setup.py
+++ b/acme/setup.py
@@ -42,6 +42,15 @@ setup(
     author="Let's Encrypt Project",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
+    classifiers=[
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: Apache Software License',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Topic :: Internet :: WWW/HTTP',
+        'Topic :: Security',
+    ],
 
     packages=find_packages(),
     install_requires=install_requires,
diff --git a/letsencrypt-apache/setup.py b/letsencrypt-apache/setup.py
index 035a10f4c..8d12b8ef2 100644
--- a/letsencrypt-apache/setup.py
+++ b/letsencrypt-apache/setup.py
@@ -22,6 +22,21 @@ setup(
     author="Let's Encrypt Project",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
+    classifiers=[
+        'Environment :: Plugins',
+        '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',
+        'Topic :: Internet :: WWW/HTTP',
+        'Topic :: Security',
+        'Topic :: System :: Installation/Setup',
+        'Topic :: System :: Networking',
+        'Topic :: System :: Systems Administration',
+        'Topic :: Utilities',
+    ],
 
     packages=find_packages(),
     install_requires=install_requires,
diff --git a/letsencrypt-compatibility-test/setup.py b/letsencrypt-compatibility-test/setup.py
index 485752e64..e69c67575 100644
--- a/letsencrypt-compatibility-test/setup.py
+++ b/letsencrypt-compatibility-test/setup.py
@@ -21,6 +21,15 @@ setup(
     author="Let's Encrypt Project",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
+    classifiers=[
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: Apache Software License',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Topic :: Internet :: WWW/HTTP',
+        'Topic :: Security',
+    ],
 
     packages=find_packages(),
     install_requires=install_requires,
diff --git a/letsencrypt-nginx/setup.py b/letsencrypt-nginx/setup.py
index 0a6d9646e..8798c9eb9 100644
--- a/letsencrypt-nginx/setup.py
+++ b/letsencrypt-nginx/setup.py
@@ -22,6 +22,21 @@ setup(
     author="Let's Encrypt Project",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
+    classifiers=[
+        'Environment :: Plugins',
+        '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',
+        'Topic :: Internet :: WWW/HTTP',
+        'Topic :: Security',
+        'Topic :: System :: Installation/Setup',
+        'Topic :: System :: Networking',
+        'Topic :: System :: Systems Administration',
+        'Topic :: Utilities',
+    ],
 
     packages=find_packages(),
     install_requires=install_requires,
diff --git a/letshelp-letsencrypt/setup.py b/letshelp-letsencrypt/setup.py
index c2981132d..f05ec0cd1 100644
--- a/letshelp-letsencrypt/setup.py
+++ b/letshelp-letsencrypt/setup.py
@@ -22,6 +22,20 @@ setup(
     author="Let's Encrypt Project",
     author_email='client-dev@letsencrypt.org',
     license="Apache License 2.0",
+    classifiers=[
+        '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',
+        'Topic :: Internet :: WWW/HTTP',
+        'Topic :: Security',
+        'Topic :: System :: Installation/Setup',
+        'Topic :: System :: Networking',
+        'Topic :: System :: Systems Administration',
+        'Topic :: Utilities',
+    ],
 
     packages=find_packages(),
     install_requires=install_requires,