diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 02a239e1006d50c92e90a928b772f6660b9f8058..fbf37ef34d7bd9a6cfc4490112170c63ec6b1246 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,8 @@
 // $Id$
 
+Drupal 6.18-dev, xxxx-xx-xx (development release)
+----------------------
+
 Drupal 6.17, 2010-06-02
 ----------------------
 - Improved PostgreSQL compatibility
diff --git a/includes/common.inc b/includes/common.inc
index 0ca24f997f824325cd7b25b7338f8200a6925910..3fb5577de7a2855cc3695a780df221d13e49c4d4 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -631,7 +631,7 @@ function drupal_error_handler($errno, $message, $filename, $line, $context) {
     return;
   }
 
-  if ($errno & (E_ALL ^ E_DEPRECATED ^ E_NOTICE)) {
+  if ($errno & (E_ALL ^ E_DEPRECATED)) {
     $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', 4096 => 'recoverable fatal error');
 
     // 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 9c54a604661e19d8fbfea4da135f76c6f8760f08..b805c02d1de7a1a88a49faefc13b580cb5dc490e 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -9,7 +9,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '6.17');
+define('VERSION', '6.18-dev');
 
 /**
  * Core API compatibility.