diff --git a/setup.py b/setup.py
index 4b328d3..9ab522f 100644
--- a/setup.py
+++ b/setup.py
@@ -52,14 +52,17 @@ def setup_package():
         package_data={"pyplink.tests": ["data/test_data.*"], },
         test_suite="pyplink.tests.test_suite",
         install_requires=["numpy >= 1.8.2", "pandas >= 0.14.1"],
-        classifiers=["Operating System :: Linux",
+        classifiers=["Operating System :: POSIX :: Linux",
+                     "Operating System :: MacOS :: MacOS X",
+                     "Operating System :: Microsoft",
                      "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",
-                     "License :: OSI Approved :: MIT License"],
+                     "License :: OSI Approved :: MIT License",
+                     "Topic :: Scientific/Engineering :: Bio-Informatics"],
+        keywords="bioinformatics format plink binary",
     )
 
     return