diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c32cf36d691..270500db317 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-06  Tom Tromey  <tromey@redhat.com>
+
+	* java/io/InputStreamReader.java (refill): Only call refill on
+	BufferedInputStream when appropriate constraints are met.
+
 2001-08-05  Tom Tromey  <tromey@redhat.com>
 
 	* java/io/StringWriter.java: Merged with Classpath.
diff --git a/libjava/java/io/InputStreamReader.java b/libjava/java/io/InputStreamReader.java
index 45fd59821ec..fff979c97ac 100644
--- a/libjava/java/io/InputStreamReader.java
+++ b/libjava/java/io/InputStreamReader.java
@@ -149,7 +149,9 @@ public class InputStreamReader extends Reader
 	// We have knowledge of the internals of BufferedInputStream
 	// here.  Eww.
 	in.mark (0);
-	boolean r = in.refill ();
+	// BufferedInputStream.refill() can only be called when
+	// `pos>=count'.
+	boolean r = in.pos < in.count || in.refill ();
 	in.reset ();
 	if (! r)
 	  return false;