diff --git a/ChangeLog b/ChangeLog
index b81118a09..8ad41c601 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $Source$
 
 2005-03-20 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/spanish: Updated, thanks to Daniel Hinostroza (hinostroza).
+    * tbl_properties.inc.php: do not add ON UPDATE CURRENT_TIMESTAMP twice
 
 2005-03-19 Alexander M. Turek  <me@derrabus.de>
     * lang/german-*.inc.php: Translations #1120157 (bad translation of
diff --git a/tbl_properties.inc.php b/tbl_properties.inc.php
index a3b7ba543..83b6a3166 100644
--- a/tbl_properties.inc.php
+++ b/tbl_properties.inc.php
@@ -331,7 +331,7 @@ for ($i = 0 ; $i < $num_fields; $i++) {
     }
 
     // Dynamically add ON UPDATE CURRENT_TIMESTAMP to the possible attributes
-    if (PMA_MYSQL_INT_VERSION >= 40102) {
+    if (PMA_MYSQL_INT_VERSION >= 40102 && !in_array('ON UPDATE CURRENT_TIMESTAMP', $cfg['AttributeTypes'])) {
         $cfg['AttributeTypes'][] = 'ON UPDATE CURRENT_TIMESTAMP';
     }