diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 2e904d7589a..cb4b0e39bb4 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-30  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR libgfortran/28335
+	* close.c (st_close): Revert previous patch and add comment.
+	* file_position.c (st_flush): Revert previous patch and add comment.
+
 2006-07-30  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
 
 	* intrinsics/date_and_time.c: Add functions for GMTIME and LTIME.
diff --git a/libgfortran/io/close.c b/libgfortran/io/close.c
index b6766ff37d5..66ea6c3fb69 100644
--- a/libgfortran/io/close.c
+++ b/libgfortran/io/close.c
@@ -102,8 +102,7 @@ st_close (st_parameter_close *clp)
         unlink (path);
 #endif
     }
-  else
-    generate_error (&clp->common, ERROR_BAD_OPTION,
-			    "Can't find specified UNIT in CLOSE");
+
+  /* CLOSE on unconnected unit is legal and a no-op: F95 std., 9.3.5. */ 
   library_end ();
 }
diff --git a/libgfortran/io/file_pos.c b/libgfortran/io/file_pos.c
index 7a71ecef63b..c306d6e8d73 100644
--- a/libgfortran/io/file_pos.c
+++ b/libgfortran/io/file_pos.c
@@ -340,9 +340,7 @@ st_flush (st_parameter_filepos *fpp)
       flush (u->s);
       unlock_unit (u);
     }
-  else
-    generate_error (&fpp->common, ERROR_BAD_OPTION,
-			"Can't find specified UNIT in FLUSH");
 
+  /* CLOSE on unconnected unit is legal and a no-op: F95 std., 9.3.5. */ 
   library_end ();
 }