diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c5bb00e6524f5392ab6e067c5a66351e638efc62..ca4a791506f6f59860ba0abd8e18e4ba6db4ec41 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,6 @@
 // $Id$
 
-Drupal 6.0, xxxx-xx-xx (development version)
+Drupal 6.0 beta 1, 2007-09-14
 ----------------------
 - New, faster and better menu system.
 - New watchdog as a hook functionality.
diff --git a/includes/common.inc b/includes/common.inc
index d781cbc4d52ceb47cef6080c02106b4096602399..f642515f22080455d7a189a3edc509ab46264c38 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -543,7 +543,7 @@ function drupal_error_handler($errno, $message, $filename, $line, $context) {
     return;
   }
 
-  if ($errno & (E_ALL)) {
+  if ($errno & (E_ALL ^ E_NOTICE)) {
     $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 369de92898c10cb357a7d6c5f4b412471a88cb03..cb0da0a742cd125cfe3be269904b9ce6771478dd 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -6,7 +6,7 @@
  * Configuration system that lets administrators modify the workings of the site.
  */
 
-define('VERSION', '6.0-dev');
+define('VERSION', '6.0-beta1');
 define('DRUPAL_CORE_COMPATIBILITY', '6.x');
 
 define('DRUPAL_MINIMUM_PHP',    '4.3.3');