diff -ur a/sklearn/externals/setup.py b/sklearn/externals/setup.py
--- a/sklearn/externals/setup.py	2014-06-23 17:03:05.831777265 +0200
+++ b/sklearn/externals/setup.py	2014-06-23 17:03:59.904217048 +0200
@@ -4,7 +4,8 @@
 def configuration(parent_package='', top_path=None):
     from numpy.distutils.misc_util import Configuration
     config = Configuration('externals', parent_package, top_path)
-    config.add_subpackage('joblib')
-    config.add_subpackage('joblib/test')
+    config.add_subpackage('bundled')
+    config.add_subpackage('bundled/joblib')
+    config.add_subpackage('bundled/joblib/test')
 
     return config