diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 1c5f6b36abf..12dd0c8d0b0 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -4353,5 +4353,27 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2015050400.00);
     }
 
+    if ($oldversion < 2015050401.00) {
+        // Make sure we have messages in the user menu because it's no longer in the nav tree.
+        $oldconfig = get_config('core', 'customusermenuitems');
+        $mymessagesconfig = "messages,message|/message/index.php|message";
+        $mypreferencesconfig = "mypreferences,moodle|/user/preferences.php|preferences";
+
+        // See if it exists.
+        if (strpos($oldconfig, $mymessagesconfig) === false) {
+            // See if mypreferences exists.
+            if (strpos($oldconfig, "mypreferences,moodle|/user/preferences.php|preferences") !== false) {
+                // Insert it before my preferences.
+                $newconfig = str_replace($mypreferencesconfig, $mymessagesconfig . "\n" . $mypreferencesconfig, $oldconfig);
+            } else {
+                // Custom config - we can only insert it at the end.
+                $newconfig = $oldconfig . "\n" . $mymessagesconfig;
+            }
+            set_config('customusermenuitems', $newconfig);
+        }
+
+        upgrade_main_savepoint(true, 2015050300.00);
+    }
+
     return true;
 }
diff --git a/version.php b/version.php
index 1f4495f894c..b2e794a9c02 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2015050400.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2015050401.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.