diff --git a/ChangeLog b/ChangeLog
index 9de6681538..179fe3dc1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,6 +72,7 @@ phpMyAdmin - ChangeLog
 - patch #3475424 [import] Fixed CSV escape for the import
 - bug #3482734 [interface] No warning on syntax error in search form 
 - bug #3423717 [core] Improved detection of SSL connection
++ FULLTEXT support for InnoDB, starting with MySQL 5.6.4
 
 3.4.11.0 (not yet released)
 
diff --git a/tbl_structure.php b/tbl_structure.php
index c2a4bd2f06..5ea46370b8 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -439,7 +439,7 @@ foreach ($fields as $row) {
         ?>
     </td>
     <?php
-        if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'ARIA' || $tbl_type == 'MARIA')
+        if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'ARIA' || $tbl_type == 'MARIA' || ($tbl_type == 'INNODB' && PMA_MYSQL_INT_VERSION >= 50604))
             // FULLTEXT is possible on TEXT, CHAR and VARCHAR
             && (strpos(' ' . $type, 'text') || strpos(' ' . $type, 'char'))) {
             echo "\n";