diff --git a/ChangeLog b/ChangeLog
index 3e44e8e04..626065253 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-02-03 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_change.php: bug 879923, NULL default value of DATETIME field
+
 2004-02-02 Marc Delisle  <lem9@users.sourceforge.net>
     * export.php: security fix, thanks to Cedric Cochin for the advisory
     * lang/slovak: Updated, thanks to Lubos Klokner (erkac).
diff --git a/tbl_change.php b/tbl_change.php
index 3a6e998d7..e698e34ba 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -277,7 +277,8 @@ foreach($loop_array AS $vrowcount => $vrow) {
         //        value (the real default value will be set in the
         //        Default value logic below)
         if ($row_table_def['Type'] == 'datetime'
-            && (!isset($row_table_def['Default']))) {
+            && (!isset($row_table_def['Default']))
+            && (!is_null($row_table_def['Default']))) {
             // INSERT case
             if ($insert_mode) {
                 if (isset($vrow)) {