diff --git a/pykd/pykdver.h b/pykd/pykdver.h
index c294612..9abd567 100644
--- a/pykd/pykdver.h
+++ b/pykd/pykdver.h
@@ -2,7 +2,7 @@
 #define PYKD_VERSION_MAJOR      0
 #define PYKD_VERSION_MINOR      3
 #define PYKD_VERSION_SUBVERSION 0
-#define PYKD_VERSION_BUILDNO    11
+#define PYKD_VERSION_BUILDNO    12
 
 #define __VER_STR2__(x) #x
 #define __VER_STR1__(x) __VER_STR2__(x)
diff --git a/setup/pykd/__init__.py b/setup/pykd/__init__.py
new file mode 100644
index 0000000..ecb8d51
--- /dev/null
+++ b/setup/pykd/__init__.py
@@ -0,0 +1,4 @@
+from pykd import *
+__version__ = pykd.__version__
+__file__ = pykd.__file__
+
diff --git a/setup/setup.py b/setup/setup.py
index 11a9475..cb22e07 100644
--- a/setup/setup.py
+++ b/setup/setup.py
@@ -1,25 +1,35 @@
 
-from setuptools import setup, Extension
+from setuptools import setup
+from setuptools.dist import Distribution
 import pkg_resources
 import argparse
 
 parser = argparse.ArgumentParser()
-parser.add_argument('cmd', choices=['bdist_egg', 'bdist', 'install'])
+parser.add_argument('cmd', choices=['bdist_egg', 'bdist', 'bdist_wheel', 'install', 'clean'])
 parser.add_argument('--plat-name', default=pkg_resources.get_build_platform() )
 
 args = parser.parse_args()
 
-pkg_dir = { 'win32' : 'src/x86', 'win-amd64' : 'src/x64' }.get( args.plat_name )
+pkg_dir = { 'win32' : 'pykd_x86', 'win-amd64' : 'pykd_x64' }.get( args.plat_name )
+
+class BinaryDistribution(Distribution):
+    def is_pure(self):
+        return False
+
+_name = "pykd"
+_version = "0.3.0.11"
+_desc = "python windbg extension"
 
 setup(
-    name = "pykd",
-    version = "0.3.0.11",
-    description = "python windbg extension",
-    package_dir = { '' : pkg_dir},
-    packages = [''],
-    package_data = { '' :["*.pyd", "*.dll"]},
+    name = _name,
+    version = _version,
+    description = _desc,
+    packages = ['pykd'],
+    package_dir = {'pykd': pkg_dir},
+    package_data = { 'pykd' :["*.pyd", "*.dll"]},
     include_package_data=True,
     zip_safe = False,
-    ext_modules = [Extension('pykd', [])], 
+    distclass = BinaryDistribution,
     )
 
+