diff --git a/ChangeLog b/ChangeLog
index 40b269b62..c5e84144d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -121,6 +121,7 @@
 
 3.3.9.0 (not yet released)
 - bug [doc] Fix references to MySQL doc
+- patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand
 
 3.3.8.0 (2010-10-25)
 - bug #3059311 [import] BIGINT field type added to table analysis
diff --git a/tbl_change.php b/tbl_change.php
index 41e823016..bee7017c8 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -542,6 +542,7 @@ foreach ($rows as $row_id => $vrow) {
 
                 if ($field['True_Type'] == 'timestamp'
                   && empty($field['Default'])
+                  && empty($data)
                   && ! isset($analyzed_sql[0]['create_table_fields'][$field['Field']]['on_update_current_timestamp'])) {
                     $default_function = $cfg['DefaultFunctions']['first_timestamp'];
                 }