Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.170
diff -u -p -r1.170 menu.inc
--- includes/menu.inc	28 May 2007 06:24:41 -0000	1.170
+++ includes/menu.inc	30 May 2007 10:40:45 -0000
@@ -1096,7 +1096,13 @@ function menu_get_active_breadcrumb() {
     $end = end($active_trail);
 
     // Don't show a link to the current page in the breadcrumb trail.
-    if ($item['href'] == $end['href'] || ($item['type'] == MENU_DEFAULT_LOCAL_TASK && $end['href'] != '<front>')) {
+    if ($item['href'] == $end['href']) {
+      array_pop($breadcrumb);
+      if (theme_get_setting('toggle_last_breadcrumb')) {
+        $breadcrumb[] = '<span>' . $end['title'] . '</span>';
+      }
+    }
+    elseif ($item['type'] == MENU_DEFAULT_LOCAL_TASK && $end['href'] != '<front>') {
       array_pop($breadcrumb);
     }
   }
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.356
diff -u -p -r1.356 theme.inc
--- includes/theme.inc	22 May 2007 19:56:00 -0000	1.356
+++ includes/theme.inc	30 May 2007 10:40:46 -0000
@@ -609,6 +609,7 @@ function theme_get_settings($key = NULL)
     'toggle_mission'                =>  1,
     'toggle_node_user_picture'      =>  0,
     'toggle_comment_user_picture'   =>  0,
+    'toggle_last_breadcrumb'        =>  0,
   );
 
   if (module_exists('node')) {
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.485
diff -u -p -r1.485 system.module
--- modules/system/system.module	30 May 2007 08:08:58 -0000	1.485
+++ modules/system/system.module	30 May 2007 10:40:48 -0000
@@ -1040,7 +1040,8 @@ function system_theme_default() {
       'name',
       'node_user_picture',
       'search',
-      'slogan'
+      'slogan',
+      'last_breadcrumb'
     ),
     'stylesheet' => 'style.css',
     'screenshot' => 'screenshot.png',
@@ -2212,7 +2213,8 @@ function system_theme_settings($key = ''
     'node_user_picture'    => t('User pictures in posts'),
     'comment_user_picture' => t('User pictures in comments'),
     'search'               => t('Search box'),
-    'favicon'              => t('Shortcut icon')
+    'favicon'              => t('Shortcut icon'),
+    'last_breadcrumb'      => t('Last breadcrumb')
   );
 
   // Some features are not always available