diff --git a/ChangeLog b/ChangeLog
index af28623407..734530b4f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog
 - bug #4924 Recaptcha failure
 - bug #4930 Database copy doesn't work for tables with more than one FULLTEXT index
 - bug #4929 Edit view structure doesn't load the algorithm
+- bug #4923 Do not limit table comments to 60 characters
 
 4.4.7.0 (2015-05-16)
 - bug #4876 Settings issues (Favorite tables shown twice in Settings)
diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index 782d6e0eb9..220fe42477 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -743,8 +743,10 @@ function PMA_getTableOptionFieldset($comment, $tbl_collation,
         . '</tr>';
 
     //Table comments
+    $commentLength = PMA_MYSQL_INT_VERSION >= 50503 ? 2048 : 60;
     $html_output .= '<tr><td>' . __('Table comments') . '</td>'
-        . '<td><input type="text" name="comment" maxlength="60" size="30"'
+        . '<td><input type="text" name="comment"'
+        . ' maxlength="' . $commentLength . '" size="30"'
         . 'value="' . htmlspecialchars($comment) . '" />'
         . '<input type="hidden" name="prev_comment" value="'
         . htmlspecialchars($comment) . '" />'
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index ce49a0ef47..9626ac6eb7 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -83,8 +83,10 @@ function PMA_getHtmlForTableConfigurations()
         . '</th>'
         . '</tr>';
 
+    $commentLength = PMA_MYSQL_INT_VERSION >= 50503 ? 2048 : 60;
     $html .= '<tr>'
-        . '<td><input type="text" name="comment" size="40" maxlength="80"'
+        . '<td><input type="text" name="comment"'
+        . ' size="40" maxlength="' . $commentLength . '"'
         . ' value="'
         . (isset($_REQUEST['comment'])
         ? htmlspecialchars($_REQUEST['comment'])
@@ -238,7 +240,7 @@ function PMA_getHtmlForTableFieldDefinitions($header_cells, $content_cells)
 }
 
 /**
- * Function to get html for the hidden fields containing index creation info 
+ * Function to get html for the hidden fields containing index creation info
  *
  * @param string $index_type the index type
  *
@@ -248,7 +250,7 @@ function PMA_getHtmlForHiddenIndexInfo($index_type)
 {
     $html = '<input type="hidden" name="' . $index_type . '" value="';
     if (! empty($_REQUEST[$index_type])) {
-        // happens when an index has been set on a column, 
+        // happens when an index has been set on a column,
         // and a column is added to the table creation dialog
         //
         // this contains a JSON-encoded string
@@ -259,7 +261,7 @@ function PMA_getHtmlForHiddenIndexInfo($index_type)
     $html .= '">';
 
     return $html;
-}    
+}
 
 /**
  * Function to get html for the create table or field add view