diff --git a/headers/private/package/hpkg/DataWriters.h b/headers/private/package/hpkg/DataWriters.h
index 1d729e5917..20e0729997 100644
--- a/headers/private/package/hpkg/DataWriters.h
+++ b/headers/private/package/hpkg/DataWriters.h
@@ -71,7 +71,7 @@ public:
 
 private:
 	// BDataOutput
-	virtual	ssize_t				Write(const void* buffer, size_t size);
+	virtual	status_t			Write(const void* buffer, size_t size);
 
 private:
 			AbstractDataWriter*	fDataWriter;
diff --git a/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp b/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp
index 7d4289f68d..62ec01fda8 100644
--- a/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp
@@ -39,7 +39,6 @@ public:
 
 	virtual ssize_t Write(const void* buffer, size_t size)
 	{
-		// TODO return size;
 		RETURN_ERROR(write_to_io_request(fRequest, buffer, size));
 	}
 
diff --git a/src/kits/package/hpkg/BufferDataOutput.cpp b/src/kits/package/hpkg/BufferDataOutput.cpp
index f2a2f930c6..4009ddf772 100644
--- a/src/kits/package/hpkg/BufferDataOutput.cpp
+++ b/src/kits/package/hpkg/BufferDataOutput.cpp
@@ -30,7 +30,7 @@ ssize_t
 BBufferDataOutput::Write(const void* buffer, size_t size)
 {
 	if (size == 0)
-		return 0;
+		return B_OK;
 	if (size > fSize - fBytesWritten)
 		return B_BAD_VALUE;
 
diff --git a/src/kits/package/hpkg/DataWriters.cpp b/src/kits/package/hpkg/DataWriters.cpp
index a0f0a18691..a22dcd01eb 100644
--- a/src/kits/package/hpkg/DataWriters.cpp
+++ b/src/kits/package/hpkg/DataWriters.cpp
@@ -111,7 +111,7 @@ ZlibDataWriter::WriteDataNoThrow(const void* buffer,
 }
 
 
-ssize_t
+status_t
 ZlibDataWriter::Write(const void* buffer, size_t size)
 {
 	return fDataWriter->WriteDataNoThrow(buffer, size);