diff --git a/dnsq.py b/dnsq.py
index cbf3910..db87cda 100644
--- a/dnsq.py
+++ b/dnsq.py
@@ -93,7 +93,7 @@ def mx_hosts_for(hostname):
 
     # strip ending . and filter None
     retval = [h.strip('.') for h in retval]
-    return filter(lambda x: x, retval)
+    return [x for x in retval if x]
 
 
 def ptr_record_for(ipaddress):
diff --git a/setup.py b/setup.py
index de2342f..6f83ab1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,5 @@
 from setuptools import setup
+import sys
 
 setup(name='dnsq',
       version='1.1.6',
@@ -9,9 +10,21 @@
       license='Apache 2',
       url='http://www.mailgun.com',
       py_modules=['dnsq'],
+      classifiers=[
+                   'Development Status :: 5 - Production/Stable',
+                   'Intended Audience :: Developers',
+                   'License :: OSI Approved :: Apache Software License',
+                   'Programming Language :: Python',
+                   'Programming Language :: Python :: 2.7',
+                   'Programming Language :: Python :: 3.3',
+                   'Programming Language :: Python :: 3.4',
+                   'Programming Language :: Python :: 3.5',
+                   'Topic :: Internet :: Name Service (DNS)',
+                   'Topic :: Software Development :: Libraries',
+                   'Topic :: Software Development :: Libraries :: Python Modules'],
       zip_safe=True,
       install_requires=[
-        'dnspython>=1.11.1',
+        'dnspython>=1.11.1' if (sys.version_info < (3,0)) else 'dnspython3>=1.11.1',
         'expiringdict>=1.1',
       ],
       )