diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f60984388836368c6eb71812c424b8c1947320e7..c2441687e7ca4b2ae2c500c0980f2f9b9d2876cf 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,7 @@
 
-Drupal 6.25-dev, xxxx-xx-xx (development release)
+Drupal 6.25, 2012-02-29
 ----------------------
+- Fixed regressions introduced in Drupal 6.24 only.
 
 Drupal 6.24, 2012-02-01
 ----------------------
diff --git a/includes/common.inc b/includes/common.inc
index 58fe6aeb5c2f5dd70703e7da697e2745f40694c1..07be8e7affc9fd3806d6f37f24b1f5126afc57c4 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)) {
+  if ($errno & (E_ALL ^ E_DEPRECATED ^ 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', 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 61c0d895d4e114b5d040132602dcfee72a6537e3..8061c5e794315eb7debdc5f7b4a7011b3d9e5989 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -8,7 +8,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '6.25-dev');
+define('VERSION', '6.25');
 
 /**
  * Core API compatibility.