diff --git a/lib/Cake/Log/CakeLog.php b/lib/Cake/Log/CakeLog.php
index a2e4d7604..8834b2b1d 100644
--- a/lib/Cake/Log/CakeLog.php
+++ b/lib/Cake/Log/CakeLog.php
@@ -285,9 +285,8 @@ class CakeLog {
  * @return void
  */
 	protected static function _autoConfig() {
-		self::$_Collection->load('error', array(
+		self::$_Collection->load('default', array(
 			'engine' => 'FileLog',
-			'types' => array('warning', 'error', 'critical', 'alert', 'emergency'),
 			'path' => LOGS,
 		));
 	}
diff --git a/lib/Cake/Test/Case/Log/CakeLogTest.php b/lib/Cake/Test/Case/Log/CakeLogTest.php
index 92eda8746..d39dcb6eb 100644
--- a/lib/Cake/Test/Case/Log/CakeLogTest.php
+++ b/lib/Cake/Test/Case/Log/CakeLogTest.php
@@ -126,8 +126,14 @@ class CakeLogTest extends CakeTestCase {
 		$this->assertTrue(file_exists(LOGS . 'error.log'));
 
 		$result = CakeLog::configured();
-		$this->assertEquals(array('error'), $result);
+		$this->assertEquals(array('default'), $result);
+
+		$testMessage = 'custom message';
+		CakeLog::write('custom', $testMessage);
+		$content = file_get_contents(LOGS . 'custom.log');
+		$this->assertContains($testMessage, $content);
 		unlink(LOGS . 'error.log');
+		unlink(LOGS . 'custom.log');
 	}
 
 /**