diff --git a/ChangeLog b/ChangeLog
index d6bf615a1..c5b31f48f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL$
 
+- bug #1674914 [structure] changing definition of a TIMESTAMP field 
 - bug #1615530 [upload] added more specific error message if field upload fails
 - [gui] avoid displaying a wide selector in server selection
 + [core] added PMA_fatalError() and made use of it
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index a01fc0a6c..64e427ca9 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -320,7 +320,7 @@ class PMA_Table {
                 $query .= ' DEFAULT NULL';
             } else {
                 if (strlen($default)) {
-                    if ($is_timestamp) {
+                    if ($is_timestamp && $default == '0') {
                         // a TIMESTAMP does not accept DEFAULT '0'
                         // but DEFAULT 0  works
                         $query .= ' DEFAULT ' . PMA_sqlAddslashes($default);