diff --git a/ChangeLog b/ChangeLog
index 86eeb86a9..c74092bc1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ $Id$
 $Source$
 
 2001-01-03  Loïc Chapeaux  <lolo@phpheaven.net>
+	* db_details.php3, line 708; tbl_properties.inc.php3, line 71: maximum
+	  table and field size is 64 characters. Suggested by
+	  Marc Weidner <gurmbot at users.sourceforge.net>.
 	* db_details.php3:
 	  - invalid xhtml statements;
 	  - extend "check/uncheck all tables" feature to js disabled browsers.
diff --git a/db_details.php3 b/db_details.php3
index a4f6b744e..0f8304fba 100755
--- a/db_details.php3
+++ b/db_details.php3
@@ -705,7 +705,7 @@ if ($num_tables > 0) {
 <?php
 echo '        ' . $strCreateNewTable . htmlspecialchars($db) . '&nbsp;:<br />' . "\n";
 echo '        ' . $strName . '&nbsp;:&nbsp;' . "\n";
-echo '        ' . '<input type="text" name="table" />' . "\n";
+echo '        ' . '<input type="text" name="table" maxlength="64" />' . "\n";
 //    echo '        ' . $strNumberIndexes. '&nbsp;:&nbsp;' . "\n";
 //    echo '        ' . '<input type="text" name="num_indexes" size="2" />' . "\n";
 echo '        ' . '<br />' . "\n";
diff --git a/tbl_properties.inc.php3 b/tbl_properties.inc.php3
index 6783eb763..928c5ce31 100755
--- a/tbl_properties.inc.php3
+++ b/tbl_properties.inc.php3
@@ -68,7 +68,7 @@ for ($i = 0 ; $i < $num_fields; $i++) {
     }
     echo "\n";
     ?>
-            <input type="text" name="field_name[]" size="10" value="<?php if (isset($row) && isset($row['Field'])) echo str_replace('"', '&quot;', $row['Field']); ?>" />
+            <input type="text" name="field_name[]" size="10" maxlength="64" value="<?php if (isset($row) && isset($row['Field'])) echo str_replace('"', '&quot;', $row['Field']); ?>" />
         </td>
         <td bgcolor="<?php echo $bgcolor; ?>">
             <select name="field_type[]">