diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php
index 69d184154..387f6088a 100644
--- a/cake/libs/cake_session.php
+++ b/cake/libs/cake_session.php
@@ -128,7 +128,7 @@ class CakeSession extends Object {
  * @access public
  */
 	function __construct($base = null, $start = true) {
-		App::import('Core', 'Security');
+		App::import('Core', 'Set', 'Security');
 		$this->time = time();
 
 		if (Configure::read('Session.checkAgent') === true || Configure::read('Session.checkAgent') === null) {
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 38d0e3f07..7c902aa63 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -25,7 +25,6 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-
 /**
  * Configuration class (singleton). Used for managing runtime configuration information.
  *
@@ -61,6 +60,9 @@ class Configure extends Object {
 	function &getInstance($boot = true) {
 		static $instance = array();
 		if (!$instance) {
+			if (!class_exists('Set')) {
+				require LIBS . 'set.php';
+			}
 			$instance[0] =& new Configure();
 			$instance[0]->__loadBootstrap($boot);
 		}