diff --git a/ChangeLog b/ChangeLog
index 8f5c0e6f0..aedaa9ba6 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ $Source$
     * lang/slovak update, thanks to Lubos Klokner
     * lang/polish: update, thanks to Jakub Wilk
     * lang/thai: update, thanks to Arthit Suriyawongkul
+    * tbl_change.php3: do not use enctype="multipart/form-data"
+      if !$is_upload (possible solution for bug 689215)
 
 2003-02-19 Alexander M. Turek  <rabus@users.sourceforge.net>
     * libraries/display_tbl.lib.php3: Coding standards.
diff --git a/tbl_change.php3 b/tbl_change.php3
index 06fe3f76f..299042c77 100755
--- a/tbl_change.php3
+++ b/tbl_change.php3
@@ -148,7 +148,7 @@ document.onkeydown = onKeyDownArrowsHandler;
 </script>
 
 <!-- Change table properties form -->
-<form method="post" action="tbl_replace.php3" name="insertForm" enctype="multipart/form-data">
+<form method="post" action="tbl_replace.php3" name="insertForm" <?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?>>
     <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
     <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
     <input type="hidden" name="pos" value="<?php echo isset($pos) ? $pos : 0; ?>" />