diff --git a/ChangeLog b/ChangeLog
index 7d471e4510..543fef260d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 
 3.5.0.0 (not yet released)
 + rfe #2021981 [interface] Add support for mass prefix change.
++ "up to date" message on main page when current version is up to date
 
 3.4.1.0 (not yet released)
 - bug #3301108 [interface] Synchronize and already configured host
diff --git a/js/functions.js b/js/functions.js
index 769365b343..b3fc631216 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -92,7 +92,7 @@ function parseVersionString (str) {
 function PMA_current_version() {
     var current = parseVersionString(pmaversion);
     var latest = parseVersionString(PMA_latest_version);
-    $('#li_pma_version').append(PMA_messages['strLatestAvailable'] + ' ' + PMA_latest_version);
+    var version_information_message = PMA_messages['strLatestAvailable'] + ' ' + PMA_latest_version;
     if (latest > current) {
         var message = $.sprintf(PMA_messages['strNewerVersion'], PMA_latest_version, PMA_latest_date);
         if (Math.floor(latest / 10000) == Math.floor(current / 10000)) {
@@ -103,6 +103,10 @@ function PMA_current_version() {
         }
         $('#maincontainer').after('<div class="' + klass + '">' + message + '</div>');
     }
+    if (latest == current) {
+        version_information_message = ' (' + PMA_messages['strUpToDate'] + ')';
+    }
+    $('#li_pma_version').append(version_information_message);
 }
 
 /**
diff --git a/js/messages.php b/js/messages.php
index d6d35db163..e0102b4abc 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -120,6 +120,7 @@ $js_messages['strMore'] = __('More');
 $js_messages['strNewerVersion'] = __('A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.');
 /* l10n: Latest available phpMyAdmin version */
 $js_messages['strLatestAvailable'] = __(', latest stable version:');
+$js_messages['strUpToDate'] = __('up to date');
 
 echo "var PMA_messages = new Array();\n";
 foreach ($js_messages as $name => $js_message) {