Index: wp-includes/nav-menu-template.php
===================================================================
--- wp-includes/nav-menu-template.php	(revision 14455)
+++ wp-includes/nav-menu-template.php	(working copy)
@@ -69,13 +69,20 @@
 		$indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
 
 		$classes = $value = '';
-
 		$classes = array( 'menu-item', 'menu-item-type-'. $item->type, $item->classes );
 
 		if ( 'custom' != $item->object )
 			$classes[] = 'menu-item-object-'. $item->object;
 
-		if ( $item->object_id == $wp_query->get_queried_object_id() )
+		// Get the requested uri
+		$current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+
+		// remove any anchor links
+		$item_url = strpos( $item->url, '#' ) ? substr( $item->url, 0, strpos( $item->url, '#' ) ) : $item->url;
+		
+		
+
+		if ( $item->object_id == $wp_query->get_queried_object_id() || ( 'custom' == $item->object && $item_url == $current_url ) )
 			$classes[] = 'current-menu-item';
 
 		// @todo add classes for parent/child relationships
@@ -289,4 +296,4 @@
 	return call_user_func_array( array(&$walker, 'walk'), $args );
 }
 
-?>
+?>
\ No newline at end of file