diff --git a/MANIFEST.in b/MANIFEST.in
index b30c302e4c04e9057d7f81df195469d70c94a49a..04ebcbe247a55e6faa0b645471f4e04e80dac68c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -16,6 +16,7 @@ include configure.py
 include Makefile.in
 include aksetup_helper.py
 include README_SETUP.txt
+include README.rst
 
 recursive-include bpl-subset/bpl_subset/boost *.h *.hpp *.cpp *.html *.inl *.ipp *.pl *.txt
 recursive-include bpl-subset/bpl_subset/libs *.h *.hpp *.cpp *.html *.inl *.ipp *.pl *.txt
diff --git a/aksetup_helper.py b/aksetup_helper.py
index a51446368c5d49b074ae8aec0e798f1960ce0c46..bdd2a0029ff7fdeee9349e536b80c424d1fd0325 100644
--- a/aksetup_helper.py
+++ b/aksetup_helper.py
@@ -85,17 +85,8 @@ class NumpyExtension(Extension):
 
 class PyUblasExtension(NumpyExtension):
     def get_module_include_path(self, name):
-        from imp import find_module
-        file, pathname, descr = find_module(name)
-        from os.path import join, exists
-        installed_path = join(pathname, "..", "include")
-        development_path = join(pathname, "..", "src", "cpp")
-        if exists(installed_path):
-            return installed_path
-        elif exists(development_path):
-            return development_path
-        else:
-            raise RuntimeError("could not find C include path for module '%s'" % name)
+        from pkg_resources import Requirement, resource_filename
+        return resource_filename(Requirement.parse(name), "%s/include" % name)
 
     @property
     def include_dirs(self):