diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 349cc1eb5..172836786 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libc/stdio/fread.c (fread): For unbuffered I/O, attempt
+	a low-level read if we don't get the full amount of bytes so
+	EOF or error flags will be set.
+
 2004-12-09  Alex Mogilnikov  <alx@intellectronika.ru>
 
 	* libc/time/tzset_r (_tzset_r): Properly skip over
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
index e0faa3578..a90c50bf4 100644
--- a/newlib/libc/stdio/fread.c
+++ b/newlib/libc/stdio/fread.c
@@ -149,7 +149,7 @@ _DEFUN(fread, (buf, size, count, fp),
 	FREEUB (fp);
 
       /* Finally read directly into user's buffer if needed.  */
-      if (resid > 0)
+      while (resid > 0)
 	{
 	  int rc = 0;
 	  /* save fp buffering state */
@@ -162,20 +162,24 @@ _DEFUN(fread, (buf, size, count, fp),
 	  fp->_p = p;
 	  rc = __srefill (fp);
 	  /* restore fp buffering back to original state */
-	  resid -= fp->_r;
-	  fp->_r = 0;
 	  fp->_bf._base = old_base;
 	  fp->_bf._size = old_size;
 	  fp->_p = old_p;
-#ifdef __SCLE
-          if (fp->_flags & __SCLE)
+	  resid -= fp->_r;
+	  p += fp->_r;
+	  fp->_r = 0;
+	  if (rc)
 	    {
-	      _funlockfile (fp);
-	      return crlf (fp, buf, total-resid, 1) / size;
-	    }
+#ifdef __SCLE
+              if (fp->_flags & __SCLE)
+	        {
+	          _funlockfile (fp);
+	          return crlf (fp, buf, total-resid, 1) / size;
+	        }
 #endif
-	  _funlockfile (fp);
-	  return (total - resid) / size;
+	      _funlockfile (fp);
+	      return (total - resid) / size;
+	    }
 	}
     }
   else