diff --git a/GPopt/GPOpt.py b/GPopt/GPOpt.py
index 7f8cfed..8c5d814 100644
--- a/GPopt/GPOpt.py
+++ b/GPopt/GPOpt.py
@@ -11,7 +11,10 @@
 import shelve
 from collections import namedtuple
 from functools import partial
-from sklearn.utils.discovery import all_estimators
+try:
+    from sklearn.utils.discovery import all_estimators
+except:
+    from sklearn.utils import all_estimators
 from sklearn.base import RegressorMixin
 from sklearn.gaussian_process import GaussianProcessRegressor
 from sklearn.ensemble import RandomForestRegressor
diff --git a/setup.py b/setup.py
index 19a09ad..dddb7ff 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from codecs import open
 from os import path
 
-__version__ = "0.6.0"
+__version__ = "0.6.1"
 
 subprocess.call("pip install -r requirements.txt", shell=True)