diff --git a/ChangeLog b/ChangeLog
index da64e3725e..565aaa64ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog
 + rfe #1578 Warn about reserved word only when a column is created
 + rfe #1590 Recaptcha API v2
 + rfe #1580 Individual Zeroconf PMA tables support
++ rfe #1525 Generate keys one per line
 
 4.3.7.0 (not yet released)
 - bug #4694 js error on marking table as favorite in Safari (in private mode)
diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php
index 84df946660..161c724a51 100644
--- a/libraries/plugins/export/ExportSql.class.php
+++ b/libraries/plugins/export/ExportSql.class.php
@@ -1340,15 +1340,13 @@ class ExportSql extends ExportPlugin
                     $sql_indexes_query_start = 'ALTER TABLE '
                         . PMA_Util::backquoteCompat(
                             $table_alias, $compat, $sql_backquotes
-                        )
-                        . $crlf . ' ';
+                        );
                     $sql_indexes_query .= $sql_indexes_query_start;
 
                     $sql_indexes_start = 'ALTER TABLE '
                         . PMA_Util::backquoteCompat(
                             $table_alias,  $compat, $sql_backquotes
-                        )
-                        . $crlf . ' ';
+                        );
                     $sql_indexes .= $sql_indexes_start;
                 }
                 if ($update_indexes_increments && preg_match(
@@ -1490,7 +1488,7 @@ class ExportSql extends ExportPlugin
                                 $sql_index_ended = false;
                             }
 
-                            $tmp_str = " ADD " . $sql_lines[$j];
+                            $tmp_str = $crlf . "  ADD " . $sql_lines[$j];
                             $sql_indexes_query .= $tmp_str;
                             $sql_indexes .= $tmp_str;