diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9705ebe1f3e0..e793eea2397d 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-21  Mark Wielaard  <mark@klomp.org>
+
+	* java/io/OutputStreamWriter.java (flush): Create work if null.
+
 2006-07-21  Keith Seitz  <keiths@redhat.com>
 
 	* java/lang/natThread.cc (_Jv_ThreadGetData): New function.
@@ -33,7 +37,7 @@
 
 2006-07-18  Paolo Bonzini  <bonzini@gnu.org>
 
-        * configure: Regenerate.
+	* configure: Regenerate.
 
 2006-07-18  Gary Benson  <gbenson@redhat.com>
 
diff --git a/libjava/java/io/OutputStreamWriter.java b/libjava/java/io/OutputStreamWriter.java
index 1f1666fe11a8..aac1684c697c 100644
--- a/libjava/java/io/OutputStreamWriter.java
+++ b/libjava/java/io/OutputStreamWriter.java
@@ -203,6 +203,8 @@ public class OutputStreamWriter extends Writer
 
 	// Always write -- if we are close()ing then we want to make
 	// sure the converter is flushed.
+	if (work == null)
+	  work = new char[100];
 	writeChars(work, 0, wcount);
 	wcount = 0;