Merge branch 'tmp'
diff --git a/certifi/core.py b/certifi/core.py
index e7ae2ee..f41d3fd 100644
--- a/certifi/core.py
+++ b/certifi/core.py
@@ -19,7 +19,7 @@
 
 
 def where():
-    f = os.path.split(__file__)[0]
+    f = os.path.dirname(__file__)
 
     return os.path.join(f, 'cacert.pem')
 
@@ -29,7 +29,7 @@
         "The weak security bundle is being deprecated.",
         DeprecatedBundleWarning
     )
-    f = os.path.split(__file__)[0]
+    f = os.path.dirname(__file__)
     return os.path.join(f, 'weak.pem')
 
 if __name__ == '__main__':
diff --git a/setup.cfg b/setup.cfg
index 5e40900..2a9acf1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,2 @@
-[wheel]
+[bdist_wheel]
 universal = 1
diff --git a/setup.py b/setup.py
index ab6ae0b..8d3b065 100755
--- a/setup.py
+++ b/setup.py
@@ -47,16 +47,20 @@
     package_data={'certifi': ['*.pem']},
     # data_files=[('certifi', ['certifi/cacert.pem'])],
     include_package_data=True,
-    license='ISC',
+    zip_safe=False,
+    license='MPL-2.0',
     classifiers=(
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'Natural Language :: English',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ),
 )