2 files changed, 14 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 010e5615..fa8bd093 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,13 @@ CHANGES
 =======
 
 -----
+0.9.4
+-----
+
+* Issue #43: Fix issue (introduced in 0.9.1) with version resolution when
+  upgrading over other releases of Setuptools.
+
+-----
 0.9.3
 -----
 
diff --git a/setup.py b/setup.py
index 4b90dfbd..d716ee2e 100755
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,12 @@ init_file.close()
 
 SETUP_COMMANDS = command_ns['__all__']
 
+main_ns = {}
+init_path = convert_path('setuptools/__init__.py')
+init_file = open(init_path)
+exec(init_file.read(), main_ns)
+init_file.close()
+
 import setuptools
 from setuptools.command.build_py import build_py as _build_py
 from setuptools.command.test import test as _test
@@ -93,7 +99,7 @@ if sys.platform == 'win32' or os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFI
 
 setup_params = dict(
     name="setuptools",
-    version=setuptools.__version__,
+    version=main_ns['__version__'],
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="The fellowship of the packaging",