diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 8332fea3522..4e72cb8bfc7 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-13  Jerry DeLisle  <jvdelisle@gcc.gnu.org
+
+	PR libfortran/37083
+	* io/list_read.c (next_char): Simplify EOF tests and set endfile flag.
+	(finish_list_read): Add EOF check.
+
 2008-10-09  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
 	PR libfortran/37753
diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
index 76634a3ee25..00cd841df24 100644
--- a/libgfortran/io/list_read.c
+++ b/libgfortran/io/list_read.c
@@ -242,15 +242,10 @@ next_char (st_parameter_dt *dtp)
     {
       if (length == 0)
 	{
-	  if (dtp->u.p.advance_status == ADVANCE_NO)
-	    {
-	      if (dtp->u.p.current_unit->endfile == AT_ENDFILE)
-		longjmp (*dtp->u.p.eof_jump, 1);
-	      dtp->u.p.current_unit->endfile = AT_ENDFILE;
-	      c = '\n';
-	    }
-	  else
+	  if (dtp->u.p.current_unit->endfile == AT_ENDFILE)
 	    longjmp (*dtp->u.p.eof_jump, 1);
+	  dtp->u.p.current_unit->endfile = AT_ENDFILE;
+	  c = '\n';
 	}
     }
 done:
@@ -1913,6 +1908,13 @@ finish_list_read (st_parameter_dt *dtp)
       c = next_char (dtp);
     }
   while (c != '\n');
+
+  if (dtp->u.p.current_unit->endfile != NO_ENDFILE)
+    {
+      generate_error (&dtp->common, LIBERROR_END, NULL);
+      dtp->u.p.current_unit->endfile = AFTER_ENDFILE;
+      dtp->u.p.current_unit->current_record = 0;
+    }
 }
 
 /*			NAMELIST INPUT