diff --git a/ChangeLog b/ChangeLog
index b7da0c77c..d24d1c33f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-23  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/NSRegularExpression.m (-rangeOfFirstMatchInString:...):
+	Return range (NSNotFound, 0) when no match is found.
+
 2011-12-22  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Source/NSRegularExpression.m (-initWithPattern:options:error:,
diff --git a/Source/NSRegularExpression.m b/Source/NSRegularExpression.m
index f97893e1a..4e2519b77 100644
--- a/Source/NSRegularExpression.m
+++ b/Source/NSRegularExpression.m
@@ -491,7 +491,7 @@ prepareResult(NSRegularExpression *regex,
                               options: (NSMatchingOptions)opts
                                 range: (NSRange)range
 {
-  __block NSRange r;
+  __block NSRange r = {NSNotFound, 0};
 
   opts &= ~NSMatchingReportProgress;
   opts &= ~NSMatchingReportCompletion;
@@ -623,7 +623,7 @@ prepareResult(NSRegularExpression *regex,
                               options: (NSMatchingOptions)opts
                                 range: (NSRange)range
 {
-  NSRange result = {0,0};
+  NSRange result = {NSNotFound, 0};
 
   FAKE_BLOCK_HACK(result,
     {