diff --git a/ChangeLog b/ChangeLog
index f9356c77d..c86ae09e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-13  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSURLHandle.m: ([loadInForeground]) return as soon as load
+	is complete, rather than waiting for up to a second.
+
 2007-06-12  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSPredicate.m:	Fake like and matches by using
diff --git a/Source/NSRunLoop.m b/Source/NSRunLoop.m
index 8ececc78e..13333ec00 100644
--- a/Source/NSRunLoop.m
+++ b/Source/NSRunLoop.m
@@ -995,11 +995,13 @@ static NSComparisonResult tSort(GSIArrayItem i0, GSIArrayItem i1)
 }
 
 /**
- * Calls -acceptInputForMode:beforeDate: to run the loop once.<br />
+ * Calls -limitDateForMode: to determine if a timeout occurs before the
+ * specified date, then calls -acceptInputForMode:beforeDate: to run the
+ * loop once.<br />
  * The specified date may be nil ... in which case the loop runs
  * until the limit date of the first input or timeout.<br />
- * If the specified date is in the past, runs the loop once only, to
- * handle any events already available.<br />
+ * If the specified date is in the past, this runs the loop once only,
+ * to handle any events already available.<br />
  * If there are no input sources in mode, returns NO without running the loop,
  * otherwise returns YES.
  */
diff --git a/Source/NSURLHandle.m b/Source/NSURLHandle.m
index 46e4f01ea..82eb07772 100644
--- a/Source/NSURLHandle.m
+++ b/Source/NSURLHandle.m
@@ -481,7 +481,7 @@ static Class		NSURLHandleClass = 0;
       NSDate	*limit;
 
       limit = [[NSDate alloc] initWithTimeIntervalSinceNow: 1.0];
-      [loop runUntilDate: limit];
+      [loop runMode: NSDefaultRunLoopMode beforeDate: limit];
       RELEASE(limit);
     }
   return _data;