diff --git a/modules/system/system.install b/modules/system/system.install
index ec6c7c021d5..dd636c843f0 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -2304,6 +2304,27 @@ function system_update_7052() {
   db_change_field('menu_router', 'file', 'include_file', array('type' => 'text', 'size' => 'medium'));
 }
 
+/**
+ * Upgrade standard blocks and menus.
+ */
+function system_update_7053() {
+  // Navigation block is now defined in system module.
+  db_update('block')
+    ->fields(array('module' => 'system'))
+    ->condition('module', 'user')
+    ->condition('delta', 'navigation')
+    ->execute();
+
+  // Create the same menus as in menu_install().
+  db_insert('menu_custom')
+    ->fields(array('menu_name' => 'user-menu', 'title' => 'User Menu', 'description' => "The <em>User</em> menu contains links related to the user's account, as well as the 'Log out' link."))
+    ->execute();
+
+  db_insert('menu_custom')
+    ->fields(array('menu_name' => 'management', 'title' => 'Management', 'description' => "The <em>Management</em> menu contains links for administrative tasks."))
+    ->execute();
+}
+
 /**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.