diff --git a/ChangeLog b/ChangeLog
index bb63185c7..ff529fc67 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ $Source$
 
 2005-04-01 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_addfield.php: TIMESTAMP options support
+    * libraries/common.lib.php: DEFAULT CURRENT_TIMESTAMP is only 
+      for TIMESTAMP (bug when changing from a TIMESTAMP to a non-TIMESTAMP type)
 
 2005-03-31 Alexander M. Turek  <me@derrabus.de>
     * left.php: Undefined offset (Bug #1174045).
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 4c5dab42c..1de0a957c 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2533,7 +2533,7 @@ if (typeof(document.getElementById) != 'undefined'
             $query .= PMA_generateCharsetQueryPart($collation);
         }
 
-        if ($default_current_timestamp) {
+        if ($default_current_timestamp && strtoupper($full_field_type) == 'TIMESTAMP') {
             $query .= ' DEFAULT CURRENT_TIMESTAMP';
         } elseif (!empty($default)) {
             if (strtoupper($default) == 'NULL') {