diff --git a/setup.py b/setup.py
index e5a277a..53388ee 100755
--- a/setup.py
+++ b/setup.py
@@ -37,13 +37,14 @@ def read_version():
     package_dir={'': 'lib'},
     include_package_data=True,
     install_requires=read_reqs('requirements.txt'),
-    license="BSD",
+    license="(BSD-3-Clause AND PSF-2.0)",
     zip_safe=False,
     keywords='astunparse',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
+        'License :: OSI Approved :: Python Software Foundation License',
+        'License :: OSI Approved :: BSD-3-Clause',
         'Natural Language :: English',
         "Programming Language :: Python :: 2",
         'Programming Language :: Python :: 2.7',