diff --git a/setup.py b/setup.py
index 116e06e..a3a0beb 100755
--- a/setup.py
+++ b/setup.py
@@ -45,17 +45,23 @@ numpy.distutils.core.setup(
     install_requires = requirements,
     classifiers = ["Development Status :: 3 - Alpha",
                 "Intended Audience :: Science/Research",
+                "Intended Audience :: Developers",
                 "License :: OSI Approved",
-                "Programming Language :: Python",
-                "Programming Language :: Python :: 3",
+                "Programming Language :: Fortran",
+                "Programming Language :: Python :: 2.7",
+                "Programming Language :: Python :: 3.4",
+                "Programming Language :: Python :: 3.5",
                 "Topic :: Scientific/Engineering :: Atmospheric Science",
-                "Topic :: Software Development :: Libraries :: Python Modules",
-                "Operating System :: OS Independent"],
+                "Topic :: Software Development",
+                "Operating System :: POSIX",
+                "Operating System :: Unix",
+                "Operating System :: MacOS",
+                "Operating System :: Microsoft :: Windows"],
     name = "wrf",
-    version = __version__,        
-    packages = setuptools.find_packages("src"),   
+    version =  __version__,
+    packages = setuptools.find_packages("src"),
     ext_modules = [ext1],
-    package_dir={"" : "src"},
+    package_dir = {"" : "src"},
     #namespace_packages=["wrf"],
     # Note:  If this doesn't work, you need to add the file to MANIFEST
     package_data={"wrf" : ["data/psadilookup.dat"]},