diff --git a/Lib/cluster/setup.py b/Lib/cluster/setup.py
index 21b6ca5377a6..6c0cca508c1e 100755
--- a/Lib/cluster/setup.py
+++ b/Lib/cluster/setup.py
@@ -1,15 +1,13 @@
 #!/usr/bin/env python
 
 import os
-from scipy.distutils.core import Extension
-from scipy.distutils.misc_util import get_path,Configuration,dot_join
 join = os.path.join
 
-def configuration(parent_package='',parent_path=None):
-    from scipy.distutils.system_info import get_info
-    package = 'cluster'
-    local_path = get_path(__name__,parent_path)
-    config = Configuration(package,parent_package)
+def configuration(parent_package='',top_path=None):
+    from scipy.distutils.misc_util import Configuration
+    config = Configuration('cluster',parent_package,top_path)
+
+    config.add_data_dir('tests')
 
     config.add_extension('_vq',
         sources=[join('src', 'vq_wrap.cpp')])
@@ -24,5 +22,5 @@ def configuration(parent_package='',parent_path=None):
           description = "Clustering Algorithms (Information Theory)",
           url = "http://www.scipy.org",
           license = "SciPy License (BSD Style)",
-          **configuration()
+          **configuration(top_path='').todict()
           )
diff --git a/MANIFEST.in b/MANIFEST.in
index 0ae5980390f8..16e7aa6faa1c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,6 @@
 #prune scipy_core
 include setup.py
 include *.txt
+include Lib/*.py
 # No more files here! They should be probably added
 # to Extension depend argument list.
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 84377d9ffb1e..371b286507a3 100755
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ def setup_package():
         config.package_dir['scipy'] = os.path.join(config.local_path,'Lib')
         
         config.add_subpackage('Lib')
-
+        config.name = 'SciPy'
         from scipy_version import scipy_version as version
         config.dict_append(version=version)