diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6122511a4526cdcf11eb76fb78849649e600180e..f60984388836368c6eb71812c424b8c1947320e7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,7 @@
 
+Drupal 6.25-dev, xxxx-xx-xx (development release)
+----------------------
+
 Drupal 6.24, 2012-02-01
 ----------------------
 - Improved performance of search indexing and user operations by adding indexes.
diff --git a/includes/common.inc b/includes/common.inc
index 4924877ceb8a24e3b2ad56d2ba423cb02d077a7d..e6fdca754d82ec8eae915a14949c52c8348c48e4 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -660,7 +660,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 4da1c7ced4f2916b39ce26c272acd30d79d7489f..1a8d237ca69eb76237d374f3f0e4048d9c987d0f 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -8,7 +8,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '6.24');
+define('VERSION', '6.25-dev');
 
 /**
  * Core API compatibility.