Index: wp-includes/nav-menu-template.php
===================================================================
--- wp-includes/nav-menu-template.php	(revision 14450)
+++ wp-includes/nav-menu-template.php	(working copy)
@@ -75,7 +75,14 @@
 		if ( 'custom' != $item->object )
 			$classes[] = 'menu-item-object-'. $item->object;
 
-		if ( $item->object_id == $wp_query->get_queried_object_id() )
+		// Get the requested uri
+		$protocol = parse_url($item->url);
+		$current_url = "{$protocol['scheme']}://{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}";
+
+		// remove any anchors to compare
+		$item_url = preg_replace( '/#(.*)/', '', $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