diff --git a/ChangeLog b/ChangeLog
index d137d5856..94aad334b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-05  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/NSString.m (-rangeOfString:options:range:locale:):
+	Correct result range with ICU codepath
+
 2012-03-05  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSXMLElement.m (-addAttribute:): Raise correct exception.
diff --git a/Source/NSString.m b/Source/NSString.m
index d011cdeff..cb79f48e2 100644
--- a/Source/NSString.m
+++ b/Source/NSString.m
@@ -2162,17 +2162,17 @@ handle_printf_atsign (FILE *stream,
 		      if ((mask & NSBackwardsSearch) == NSBackwardsSearch)
 			{
 			  if (matchLocation + matchLength == NSMaxRange(aRange))
-			    result = NSMakeRange(matchLocation, matchLength);
+			    result = NSMakeRange(aRange.location + matchLocation, matchLength);
 			}
 		      else
 			{
 			  if (matchLocation == 0)
-			    result = NSMakeRange(matchLocation, matchLength);
+			    result = NSMakeRange(aRange.location + matchLocation, matchLength);
 			}
 		    }
 		  else 
 		    {
-		      result = NSMakeRange(matchLocation, matchLength);
+		      result = NSMakeRange(aRange.location + matchLocation, matchLength);
 		    }
 		}
 	    }