diff --git a/ChangeLog b/ChangeLog
index ddb8c7266008..9b052fb07047 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,7 @@ phpMyAdmin - ChangeLog
 - issue #11828 Do not invoke FLUSH PRIVILEGES when server in --skip-grant-tables
 - issue #11804 Misleading message for configuration storage
 - issue #11772 Table pagination does nothing when session expired
+- issue #11840 Index comments not working properly
 
 4.5.3.1 (2015-12-25)
 - issue #11774 Undefined offset 2
diff --git a/libraries/sql-parser/src/Components/Key.php b/libraries/sql-parser/src/Components/Key.php
index 490d0675640d..161dfc6153e4 100644
--- a/libraries/sql-parser/src/Components/Key.php
+++ b/libraries/sql-parser/src/Components/Key.php
@@ -37,6 +37,7 @@ class Key extends Component
         'KEY_BLOCK_SIZE'                => array(1, 'var'),
         'USING'                         => array(2, 'var'),
         'WITH PARSER'                   => array(3, 'var'),
+        'COMMENT'                       => array(4, 'var='),
     );
 
     /**