diff --git a/docs/sphinx/source/whatsnew/v0.3.3.txt b/docs/sphinx/source/whatsnew/v0.3.3.txt
index fd539b27aa..1fd55ea171 100644
--- a/docs/sphinx/source/whatsnew/v0.3.3.txt
+++ b/docs/sphinx/source/whatsnew/v0.3.3.txt
@@ -24,6 +24,7 @@ Bug fixes
 * Clarify that ``ModelChain`` and ``basic_chain`` currently only
   supports SAPM. (:issue:`177`)
 * Fix version number in 0.3.2 whatsnew file.
+* Add classifiers to setup.py. (:issue:`181`)
 
 
 Contributors
diff --git a/setup.py b/setup.py
index 756c0f2adf..19168520c7 100755
--- a/setup.py
+++ b/setup.py
@@ -24,6 +24,21 @@
 MAINTAINER_EMAIL = 'holmgren@email.arizona.edu'
 URL = 'https://github.com/pvlib/pvlib-python'
 
+CLASSIFIERS = [
+    'Development Status :: 4 - Beta',
+    'License :: OSI Approved :: BSD License',
+    'Operating System :: OS Independent',
+    'Intended Audience :: Science/Research',
+    'Programming Language :: Python',
+    'Programming Language :: Python :: 2',
+    'Programming Language :: Python :: 2.7',
+    'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: 3.3',
+    'Programming Language :: Python :: 3.4',
+    'Programming Language :: Python :: 3.5',
+    'Topic :: Scientific/Engineering',
+]
+
 # check python version.
 if not sys.version_info[:2] in ((2,7), (3,3), (3,4), (3,5)):
    sys.exit('%s requires Python 2.7, 3.3, or 3.4' % DISTNAME)
@@ -72,4 +87,5 @@
       maintainer_email=MAINTAINER_EMAIL,
       license=LICENSE,
       url=URL,
+      classifiers=CLASSIFIERS,
       **setuptools_kwargs)