diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5a30d872c86d42d2090253d7ccad58e6aab0c677..268a4efa01f9d8908dfc73f4a745e640f5e3ec05 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,6 @@
 // $Id$
 
-Drupal 6.0-rc2, 2008-01-10
+Drupal 6.0, xxxx-xx-xx (development version)
 ----------------------
 - New, faster and better menu system.
 - New watchdog as a hook functionality.
diff --git a/includes/common.inc b/includes/common.inc
index 15a13729724546acd03c8c7cd9ab17985e9bcf90..fbd88e9938134752e3fbb5db3dcf4632ad698de0 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -577,7 +577,7 @@ function drupal_error_handler($errno, $message, $filename, $line, $context) {
     return;
   }
 
-  if ($errno & (E_ALL ^ E_NOTICE)) {
+  if ($errno & (E_ALL)) {
     $types = array(1 => 'error', 2 => 'warning', 4 => 'parse error', 8 => 'notice', 16 => 'core error', 32 => 'core warning', 64 => 'compile error', 128 => 'compile warning', 256 => 'user error', 512 => 'user warning', 1024 => 'user notice', 2048 => 'strict warning');
 
     // For database errors, we want the line number/file name of the place that
diff --git a/modules/system/system.module b/modules/system/system.module
index 5d37772e3ed0cb5ae375eb7769333322fee66bd6..35b8999beaea90614dfcdd6a5cf07d79221c9bcc 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -9,7 +9,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '6.0-rc2');
+define('VERSION', '6.0-dev');
 
 /**
  * Core API compatibility.