diff --git a/cake/console/cake.php b/cake/console/cake.php
index 02a5bd90b..ab4d6c891 100644
--- a/cake/console/cake.php
+++ b/cake/console/cake.php
@@ -226,7 +226,6 @@ class ShellDispatcher {
 		if (!class_exists('Folder')) {
 			require LIBS . 'folder.php';
 		}
-
 		foreach ($pluginPaths as $pluginPath) {
 			$Folder =& new Folder($pluginPath);
 			list($plugins,) = $Folder->read(false, true);
@@ -608,7 +607,6 @@ class ShellDispatcher {
 
 		$this->stdout("\nAvailable Shells:");
 		$_shells = array();
-
 		foreach ($this->shellPaths as $path) {
 			if (is_dir($path)) {
 				$shells = App::objects('file', $path);
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 02f49bc9b..95a125deb 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -630,9 +630,9 @@ class App extends Object {
 			'views' => array(VIEWS),
 			'helpers' => array(HELPERS),
 			'locales' => array(APP . 'locale' . DS),
-			'shells' => array(APP . 'vendors' . DS . 'shells', VENDORS . 'shells'),
+			'shells' => array(APP . 'vendors' . DS . 'shells' . DS, VENDORS . 'shells' . DS),
 			'vendors' => array(APP . 'vendors' . DS, VENDORS),
-			'plugins' => array(APP . 'plugins' . DS),
+			'plugins' => array(APP . 'plugins' . DS, CAKE_CORE_INCLUDE_PATH . DS . 'plugins' . DS),
 		);
 
 		if ($reset == true) {
diff --git a/plugins/empty b/plugins/empty
new file mode 100644
index 000000000..e69de29bb