diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e659b42757d2..0bb44d7f66f9 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-17  David Daney  <ddaney@avtrex.com>
+
+	* java/io/BufferedInputStream.java (skip): Return zero on EOF.
+
 2004-11-17  Michael Koch  <konqueror@gmx.de>
 
 	* java/net/Socket.java (getPort): Return 0 in error case.
diff --git a/libjava/java/io/BufferedInputStream.java b/libjava/java/io/BufferedInputStream.java
index 17c570f104b3..27fc4b7b49df 100644
--- a/libjava/java/io/BufferedInputStream.java
+++ b/libjava/java/io/BufferedInputStream.java
@@ -321,7 +321,7 @@ public class BufferedInputStream extends FilterInputStream
 	  if (n < origN)
 	    break;
 	  else
-	    return -1;	// No bytes were read before EOF.
+	    return 0;	// No bytes were read before EOF.
 
 	int numread = (int) Math.min((long) (count - pos), n);
 	pos += numread;