diff --git a/ChangeLog b/ChangeLog
index 53bef9ddf..0f0549b8e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2001-01-05  Loïc Chapeaux  <lolo@phpheaven.net>
+	* main.php3, line 234: maximum database name size is 64 characters.
+
 2001-01-04  Loïc Chapeaux  <lolo@phpheaven.net>
 	* db_details.php3: beautify the displayed page.
 
diff --git a/main.php3 b/main.php3
index c28aa0992..6bbfd5abb 100755
--- a/main.php3
+++ b/main.php3
@@ -231,7 +231,7 @@ if ($server > 0) {
                 <input type="hidden" name="server" value="<?php echo $server; ?>" />
                 <input type="hidden" name="lang" value="<?php echo $lang; ?>" />
                 <input type="hidden" name="reload" value="1" />
-                <input type="text" name="db" value="<?php echo $db_to_create; ?>" />
+                <input type="text" name="db" value="<?php echo $db_to_create; ?>" maxlength="64" />
                 <input type="submit" value="<?php echo $strCreate; ?>" />
             </form>
             </td>