diff --git a/setup.cfg b/setup.cfg
index f11f162..818562e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,6 +15,10 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: OS Independent
     Programming Language :: Python
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.5
 
 [files]
 packages =
@@ -24,6 +28,9 @@ packages =
 console_scripts =
     geard = gear.cmd.geard:main
 
+[bdist_wheel]
+universal = 1
+
 [build_sphinx]
 all_files = 1
 build-dir = doc/build