=== modified file 'includes/menu.inc'
--- includes/menu.inc	2009-02-09 16:27:35 +0000
+++ includes/menu.inc	2009-03-07 22:49:59 +0000
@@ -1842,7 +1842,7 @@ function _menu_link_build($item) {
   // the menu links generated automatically from entries in {menu_router}.
   $item['module'] = 'system';
   $item += array(
-    'menu_name' => 'navigation',
+    'menu_name' => $item['_parts'][0] == 'admin' ? 'administration' : 'navigation',
     'link_title' => $item['title'],
     'link_path' => $item['path'],
     'hidden' => 0,

=== modified file 'modules/menu/menu.install'
--- modules/menu/menu.install	2008-11-15 13:01:04 +0000
+++ modules/menu/menu.install	2009-03-07 22:45:23 +0000
@@ -12,6 +12,7 @@ function menu_install() {
   db_query("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('%s', '%s', '%s')", 'navigation', $t('Navigation'), $t('The navigation menu is provided by Drupal and is the main interactive menu for any site. It is usually the only menu that contains personalized links for authenticated users, and is often not even visible to anonymous users.'));
   db_query("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('%s', '%s', '%s')", 'main-menu', $t('Main menu'), $t('The Main menu is often used by themes to show the major sections of a site.'));
   db_query("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('%s', '%s', '%s')", 'secondary-menu', $t('Secondary menu'), $t('The Secondary menu is often used for pages like legal notices, contact details, and other navigation items that play a lesser role than the Main menu.'));
+  db_query("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('%s', '%s', '%s')", 'administration', $t('Administration menu'), $t('Administration items.'));
 }
 
 /**

=== modified file 'modules/system/system.module'
--- modules/system/system.module	2009-02-22 17:55:28 +0000
+++ modules/system/system.module	2009-03-07 23:07:00 +0000
@@ -780,12 +780,16 @@ function _system_themes_access($theme) {
  * Implementation of hook_init().
  */
 function system_init() {
-  // Use the administrative theme if the user is looking at a page in the admin/* path.
+  // Use the administrative theme if the user is looking at a page in the admin/* or on a node/add or node edit path.
   if (arg(0) == 'admin' || (variable_get('node_admin_theme', '0') && arg(0) == 'node' && (arg(1) == 'add' || arg(2) == 'edit'))) {
     global $custom_theme;
     $custom_theme = variable_get('admin_theme', 0);
     drupal_add_css(drupal_get_path('module', 'system') . '/admin.css');
   }
+  // Use the administrative theme if the user is looking at a page in the admin/* path.
+  if (arg(0) == 'admin') {
+    menu_set_active_menu_name('administration');
+  }
 
   // Add the CSS for this module.
   drupal_add_css(drupal_get_path('module', 'system') . '/defaults.css');

=== modified file 'profiles/default/default.profile'
--- profiles/default/default.profile	2009-02-03 12:30:14 +0000
+++ profiles/default/default.profile	2009-03-07 23:02:47 +0000
@@ -90,10 +90,11 @@ function default_profile_task_list() {
  *   modify the $task, otherwise discarded.
  */
 function default_profile_tasks(&$task, $url) {
-  
+
   // Enable 3 standard blocks.
   db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'user', 'login', 'garland', 1, 0, 'left', '', -1);
   db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'user', 'navigation', 'garland', 1, 0, 'left', '', -1);
+  db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'menu', 'administration', 'garland', 1, 0, 'left', '', -1);
   db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'system', 'powered-by', 'garland', 1, 10, 'footer', '', -1);
 
   // Insert default user-defined node types into the database. For a complete