diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 48743844716..b883bb22029 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-27  Tom Tromey  <tromey@cygnus.com>
+
+	* java/io/OutputStreamWriter.java (close): Only flush if not
+	closed.
+
 2000-07-27  Warren Levy  <warrenl@cygnus.com>
 
 	* mauve-libgcj: Activated serialization tests.
diff --git a/libjava/java/io/OutputStreamWriter.java b/libjava/java/io/OutputStreamWriter.java
index 2fe64772b5b..e888c66a52e 100644
--- a/libjava/java/io/OutputStreamWriter.java
+++ b/libjava/java/io/OutputStreamWriter.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -55,9 +55,9 @@ public class OutputStreamWriter extends Writer
   {
     synchronized (lock)
       {
-	flush();
 	if (out != null)
 	  {
+	    flush();
 	    out.close();
 	    out = null;
 	  }