diff --git a/ChangeLog b/ChangeLog
index db322c3abe..d29a05480c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,6 +83,7 @@ VerboseMultiSubmit, ReplaceHelpImg
 - Bug #3576788 Grid editing shows the value before silent truncation
 - Upgraded jqPlot to 1.0.4 r1121
 - Upgraded to jquery-ui-timepicker-addon 1.1.1
++ rfe #3599046 [interface] Added comments for indexes
 
 3.5.6.0 (not yet released)
 - bug #3593604 [status] Erroneous advisor rule
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 6cac0f6207..6a8a38e28c 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -99,6 +99,7 @@ if (isset($_REQUEST['do_save_data'])) {
         $sql_query .= ' (' . implode(', ', $index_fields) . ')';
     }
 
+    $sql_query .= "COMMENT '" . PMA_Util::sqlAddSlashes($index->getComment()) . "'";
     $sql_query .= ';';
 
     if (! $error) {
@@ -219,6 +220,18 @@ echo PMA_Util::showHint(
             value="<?php echo htmlspecialchars($index->getName()); ?>"
             onfocus="this.select()" />
     </div>
+    <div>
+        <div class="label">
+            <strong>
+                <label for="input_index_comment">
+                    <?php echo __('Comment:'); ?>
+                </label>
+            </strong>
+        </div>
+        <input type="text" name="index[Index_comment]" id="input_index_comment" size="30"
+            value="<?php echo htmlspecialchars($index->getComment()); ?>"
+            onfocus="this.select()" />
+    </div>
     <div>
         <div class="label">
             <strong>