diff --git a/ChangeLog b/ChangeLog
index af2d92547b..e57360ec47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,8 +7,9 @@ phpMyAdmin - ChangeLog
 + rfe #1564 Improve action message on Tracking page
 + rfe #1566 Change value of "Number of rows:" when "Show all" is checked
 + rfe       Focus console by clicking on white space
-+ rfe 1507  Part 1: Cycle through console history with keyboard up/down arrows
++ rfe #1507  Part 1: Cycle through console history with keyboard up/down arrows
 + rfe #1579 Default to primary key when adding relation
++ rfe #1572 User prefs: Diff-friendly JSON for config
 
 4.3.4.0 (not yet released)
 - bug #4653 Always connection error was shown, on /setup at tab "configuration storage"
diff --git a/prefs_manage.php b/prefs_manage.php
index 86bc6c7fa4..0b795ecd67 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -30,7 +30,7 @@ if (isset($_POST['submit_export'])
     $filename = 'phpMyAdmin-config-' . urlencode(PMA_getenv('HTTP_HOST')) . '.json';
     PMA_downloadHeader($filename, 'application/json');
     $settings = PMA_loadUserprefs();
-    echo json_encode($settings['config_data']);
+    echo json_encode($settings['config_data'], JSON_PRETTY_PRINT);
     exit;
 } else if (isset($_POST['submit_get_json'])) {
     $settings = PMA_loadUserprefs();