@@ -31,11 +31,11 @@
 #import "OFNotOpenException.h"
 #import "OFOutOfRangeException.h"
 #import "OFTruncatedDataException.h"
 #import "OFWriteFailedException.h"
 
-@interface OFTarArchive_FileReadStream: OFStream
+@interface OFTarArchive_FileReadStream: OFStream <OFReadyForReadingObserving>
 {
 	OFTarArchiveEntry *_entry;
 	OF_KINDOF(OFStream *) _stream;
 	uint64_t _toRead;
 	bool _atEndOfStream;
@@ -44,14 +44,14 @@
 - (instancetype)initWithStream: (OFStream *)stream
 			 entry: (OFTarArchiveEntry *)entry;
 - (void)of_skip;
 @end
 
-@interface OFTarArchive_FileWriteStream: OFStream
+@interface OFTarArchive_FileWriteStream: OFStream <OFReadyForWritingObserving>
 {
 	OFTarArchiveEntry *_entry;
-	OFStream *_stream;
+	OF_KINDOF(OFStream *) _stream;
 	uint64_t _toWrite;
 }
 
 - (instancetype)initWithStream: (OFStream *)stream
 			 entry: (OFTarArchiveEntry *)entry;
@@ -201,11 +201,11 @@
 		     entry: entry];
 
 	return entry;
 }
 
-- (OFStream *)streamForReadingCurrentEntry
+- (OFStream <OFReadyForReadingObserving> *)streamForReadingCurrentEntry
 {
 	if (_mode != OF_TAR_ARCHIVE_MODE_READ)
 		@throw [OFInvalidArgumentException exception];
 
 	if (_lastReturnedStream == nil)
@@ -212,11 +212,12 @@
 		@throw [OFInvalidArgumentException exception];
 
 	return [[_lastReturnedStream retain] autorelease];
 }
 
-- (OFStream *)streamForWritingEntry: (OFTarArchiveEntry *)entry
+- (OFStream <OFReadyForWritingObserving> *)
+    streamForWritingEntry: (OFTarArchiveEntry *)entry
 {
 	void *pool;
 
 	if (_mode != OF_TAR_ARCHIVE_MODE_WRITE &&
 	    _mode != OF_TAR_ARCHIVE_MODE_APPEND)