diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index 90f79ebd13..4c4618751c 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -75,7 +75,8 @@ function PMA_getHtmlForRenameDatabase($db)
         . '</legend>';
 
     $html_output .= '<input id="new_db_name" type="text" name="newname" '
-        . 'size="30" class="textfield" value="" required="required" />'
+        . 'maxlength="64" size="30" class="textfield" value="" '
+        . 'required="required" />'
         . '</fieldset>'
         . '<fieldset class="tblFooters">'
         . '<input id="rename_db_input" type="submit" value="' . __('Go') . '" />'
@@ -173,7 +174,7 @@ function PMA_getHtmlForCopyDatabase($db)
     }
     $html_output .= __('Copy database to')
         . '</legend>'
-        . '<input type="text" name="newname" size="30" '
+        . '<input type="text" maxlength="64" name="newname" size="30" '
         . 'class="textfield" value="" required="required" /><br />'
         . PMA_Util::getRadioFields(
             'what', $choices, 'data', true
@@ -632,7 +633,7 @@ function PMA_getHtmlForMoveTable()
     }
     $html_output .= '&nbsp;<strong>.</strong>&nbsp;';
     $html_output .= '<input class="halfWidth" type="text" size="20" name="new_name"'
-        . ' required="required" '
+        . ' maxlength="64" required="required" '
         . 'value="' . htmlspecialchars($GLOBALS['table']) . '" /><br />';
 
     // starting with MySQL 5.0.24, SHOW CREATE TABLE includes the AUTO_INCREMENT
@@ -735,7 +736,7 @@ function PMA_getTableOptionFieldset($comment, $tbl_collation,
     //Change table name
     $html_output .= '<tr><td>' . __('Rename table to') . '</td>'
         . '<td>'
-        . '<input type="text" size="20" name="new_name" '
+        . '<input type="text" size="20" name="new_name" maxlength="64" '
         . 'value="' . htmlspecialchars($GLOBALS['table'])
         . '" required="required" />'
         . '</td>'
@@ -965,7 +966,7 @@ function PMA_getHtmlForCopytable()
     }
     $html_output .= '&nbsp;<strong>.</strong>&nbsp;';
     $html_output .= '<input class="halfWidth" type="text" required="required" '
-        . 'size="20" name="new_name" '
+        . 'size="20" name="new_name" maxlength="64" '
         . 'value="' . htmlspecialchars($GLOBALS['table']) . '"/><br />';
 
     $choices = array(
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index d15f41aa04..95e4a55db6 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -84,7 +84,7 @@ function PMA_getHtmlForTableConfigurations()
         . '</tr>';
 
     $html .= '<tr>'
-        . '<td><input type="text" name="comment" size="40" maxlength="80"'
+        . '<td><input type="text" name="comment" size="40" maxlength="60"'
         . ' value="'
         . (isset($_REQUEST['comment'])
         ? htmlspecialchars($_REQUEST['comment'])
@@ -178,7 +178,7 @@ function PMA_getHtmlForTableNameAndNoOfColumns()
         . '<table id="table_name_col_no">'
         . '<tr class="vmiddle floatleft">'
         . '<td>' . __('Table name')
-        . ':&nbsp;<input type="text" name="table" size="40" maxlength="80"'
+        . ':&nbsp;<input type="text" name="table" size="40" maxlength="64"'
         . ' value="'
         . (isset($_REQUEST['table']) ? htmlspecialchars($_REQUEST['table']) : '')
         . '" class="textfield" autofocus required />'
diff --git a/test/libraries/PMA_tbl_columns_definition_form_test.php b/test/libraries/PMA_tbl_columns_definition_form_test.php
index 32c3e97fb3..53e2205c2d 100644
--- a/test/libraries/PMA_tbl_columns_definition_form_test.php
+++ b/test/libraries/PMA_tbl_columns_definition_form_test.php
@@ -142,7 +142,7 @@ class PMA_TblColumnsDefinitionFormTest extends PHPUnit_Framework_TestCase
 
         $this->assertTag(
             PMA_getTagArray(
-                '<input type="text" name="comment" size="40" maxlength="80" '
+                '<input type="text" name="comment" size="40" maxlength="60" '
                 . 'value="c&d" class="textfield"'
             ),
             $result
@@ -223,7 +223,7 @@ class PMA_TblColumnsDefinitionFormTest extends PHPUnit_Framework_TestCase
 
         $this->assertTag(
             PMA_getTagArray(
-                '<input type="text" name="table" size="40" maxlength="80" '
+                '<input type="text" name="table" size="40" maxlength="64" '
                 . 'value="tablename" class="textfield" '
             ),
             $result