diff --git a/ChangeLog b/ChangeLog
index 0edced75b1..91bafb89fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,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 e46850560a..f6da1846a5 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -874,19 +874,22 @@ function PMA_getHtmlForRenameTable()
 /**
  * Get HTML for the table comments part of table options
  *
- * @param string $current_value of the table comments 
+ * @param string $current_value of the table comments
  *
  * @return string $html_output
  */
 function PMA_getHtmlForTableComments($current_value)
 {
+    $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($current_value) . '" />'
         . '<input type="hidden" name="prev_comment" value="'
         . htmlspecialchars($current_value) . '" />'
         . '</td>'
         . '</tr>';
+
     return $html_output;
 }
 
@@ -954,7 +957,7 @@ function PMA_getTableOptionFieldset($comment, $tbl_collation,
         . '<legend>' . __('Table options') . '</legend>';
 
     $html_output .= '<table>';
-    $html_output .= PMA_getHtmlForRenameTable(); 
+    $html_output .= PMA_getHtmlForRenameTable();
     $html_output .= PMA_getHtmlForTableComments($comment);
 
     //Storage engine
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 869a230b13..eab7c5f6d9 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="60"'
+        . '<td><input type="text" name="comment"'
+        . ' size="40" maxlength="' . $commentLength . '"'
         . ' value="'
         . (isset($_REQUEST['comment'])
         ? htmlspecialchars($_REQUEST['comment'])