diff --git a/ChangeLog b/ChangeLog
index c130fbb61..c582d000c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-02-04 Michal Čihař  <michal@cihar.com>
+    * tbl_change.php: Fix TIMESTAMP editing on MySQL 4.1 (bug #1114120).
+
 2005-02-03 Alexander M. Turek  <me@derrabus.de>
     * tbl_addfield.php: Bug #1040682 (adding field with collation).
 
diff --git a/tbl_change.php b/tbl_change.php
index 3047234db..89da53632 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -806,7 +806,7 @@ foreach ($loop_array AS $vrowcount => $vrow) {
                     ?>
                     <script type="text/javascript">
                     <!--
-                    document.write('<a title="<?php echo $strCalendar;?>" href="javascript:openCalendar(\'<?php echo PMA_generate_common_url();?>\', \'insertForm\', \'field_<?php echo ($idindex); ?>_3\', \'<?php echo substr($type, 0, 9)?>\')"><img class="calendar" src="<?php echo $pmaThemeImage; ?>b_calendar.png" alt="<?php echo $strCalendar; ?>"/></a>');
+                    document.write('<a title="<?php echo $strCalendar;?>" href="javascript:openCalendar(\'<?php echo PMA_generate_common_url();?>\', \'insertForm\', \'field_<?php echo ($idindex); ?>_3\', \'<?php echo (PMA_MYSQL_INT_VERSION >= 40100 && substr($type, 0, 9) == 'timestamp') ? 'datetime' : substr($type, 0, 9); ?>\')"><img class="calendar" src="<?php echo $pmaThemeImage; ?>b_calendar.png" alt="<?php echo $strCalendar; ?>"/></a>');
                     //-->
                     </script>
                     <?php