diff --git a/cake/libs/set.php b/cake/libs/set.php
index ce0eae7dd..f63138451 100644
--- a/cake/libs/set.php
+++ b/cake/libs/set.php
@@ -404,7 +404,7 @@ class Set extends Object {
 			$contexts = array($data);
 		}
 
-		$tokens = array_slice(explode('/', $path), 1);
+		$tokens = array_slice(preg_split('/(?<!=)\/(?!])/', $path), 1);
 		do {
 			$token = array_shift($tokens);
 			$conditions = false;
@@ -503,7 +503,9 @@ class Set extends Object {
 				return false;
 			}
 			$val = $data[$key];
-			if ($op == '=' &&  $val != $expected) {
+			if ($op == '=' && $expected{0} == '/') {
+				return preg_match($expected, $val);
+			} elseif ($op == '=' &&  $val != $expected) {
 				return false;
 			} elseif ($op == '!=' && $val == $expected) {
 				return false;
diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index 61e4fc2e7..65ddc0d4e 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -423,6 +423,10 @@ class SetTest extends UnitTestCase {
 		$expected = array(4);
 		$r = Set::extract('/User/id', $single);
 		$this->assertEqual($r, $expected);
+
+		$expected = array(1, 3);
+		$r = Set::extract('/User[name=/n/]/id', $tricky);
+		$this->assertEqual($r, $expected);	
 		
 		$common = array(	
 			array(