@@ -33,10 +33,11 @@
 # import "OFTCPSocket.h"
 #endif
 #ifdef OF_HAVE_THREADS
 # import "OFMutex.h"
 #endif
+#import "OFDate.h"
 
 #ifdef HAVE_KQUEUE
 # import "OFStreamObserver_kqueue.h"
 #endif
 #ifdef HAVE_POLL_H
@@ -368,18 +369,23 @@
 	}
 }
 
 - (void)observe
 {
-	[self observeWithTimeout: -1];
+	[self observeForTimeInterval: -1];
 }
 
-- (bool)observeWithTimeout: (double)timeout
+- (bool)observeForTimeInterval: (double)timeInterval
 {
 	[self doesNotRecognizeSelector: _cmd];
 	abort();
 }
+
+- (bool)observeUntilDate: (OFDate*)date
+{
+	return [self observeForTimeInterval: [date timeIntervalSinceNow]];
+}
 
 - (void)cancel
 {
 #ifndef _WIN32
 	OF_ENSURE(write(_cancelFD[1], "", 1) > 0);