diff --git a/includes/menu.inc b/includes/menu.inc
index d18490e888c..d93f0c09ddc 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -1050,7 +1050,9 @@ function menu_navigation_links($menu_name, $level = 0) {
       $l = $item['link']['options'];
       $l['href'] = $item['link']['href'];
       $l['title'] = $item['link']['title'];
-      $links[] = $l;
+      $l['attributes']['id'] = $item['link']['mlid'];
+      // Keyed with unique menu id to generate classes from theme_links().
+      $links['menu-'. $item['link']['mlid']] = $l;
     }
   }
   return $links;
@@ -1273,7 +1275,7 @@ function menu_set_active_trail($new_trail = NULL) {
     if ($item['tab_parent']) {
       // The title of a local task is used for the tab, never the page title.
       // Thus, replace it with the item corresponding to the root path to get
-      // the relevant href and title.  For example, the menu item corresponding 
+      // the relevant href and title.  For example, the menu item corresponding
       // to 'admin' is used when on the 'By module' tab at 'admin/by-module'.
       $parts = explode('/', $item['tab_root']);
       $args = arg();