diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0e84dbbc1832e9c05a80fe8ce40bbb918c4bef84..4c58b4dcd3e30a0b2a5157a2db1a27913d72a6fb 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,7 +1,8 @@
 // $Id$
 
-Drupal 6.8-dev, xxxx-xx-xx (development release)
+Drupal 6.8, 2008-12-11
 ----------------------
+- Removed a previous change incompatible with PHP 5.1.x and lower.
 
 Drupal 6.7, 2008-12-10
 ----------------------
@@ -153,6 +154,10 @@ Drupal 6.0, 2008-02-13
 - Removed old system updates. Updates from Drupal versions prior to 5.x will
   require upgrading to 5.x before upgrading to 6.x.
 
+Drupal 5.14, 2008-12-11
+----------------------
+- Removed a previous change incompatible with PHP 5.1.x and lower.
+
 Drupal 5.13, 2008-12-10
 -----------------------
 - fixed a variety of small bugs.
diff --git a/includes/common.inc b/includes/common.inc
index a6cb14a54b93b80f46e995338782b9eba9fab6f2..9ae6c9600f0dc561b4ef2dd3ff9553761809d082 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -586,7 +586,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', 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 0f3098fbd7b77fa53200eb2db3be3ed63b92d162..9ff9312b0a30ff0532034e7f4b3b95c54eef3a32 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -9,7 +9,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '6.8-dev');
+define('VERSION', '6.8');
 
 /**
  * Core API compatibility.