diff --git a/setup.py b/setup.py
index 12094b4..281df88 100644
--- a/setup.py
+++ b/setup.py
@@ -38,5 +38,7 @@ setup(name='boltons',
           'Development Status :: 5 - Production/Stable',
           'Programming Language :: Python :: 2.6',
           'Programming Language :: Python :: 2.7',
-          'Programming Language :: Python :: 3.4', ]
+          'Programming Language :: Python :: 3.4',
+          'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: Implementation :: PyPy', ]
       )