diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9f42ad101b3..4d9ef2453db 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-17  Jeff Sturm  <jsturm@one-point.com>
+
+	* gnu/gcj/convert/UnicodeToBytes.java (write): Write work buffer
+	starting from zero offset.
+
 2001-08-17  Hans-J. Boehm <Hans_Boehm@hp.com>
 
 	* boehm.cc: Include gc_local_alloc.h if appropriate.
diff --git a/libjava/gnu/gcj/convert/UnicodeToBytes.java b/libjava/gnu/gcj/convert/UnicodeToBytes.java
index 858be11f674..8181cb83109 100644
--- a/libjava/gnu/gcj/convert/UnicodeToBytes.java
+++ b/libjava/gnu/gcj/convert/UnicodeToBytes.java
@@ -143,7 +143,7 @@ public abstract class UnicodeToBytes extends IOConverter
       work = new char[inlength];
     int srcEnd = inpos + (inlength > work.length ? work.length : inlength);
     str.getChars(inpos, srcEnd, work, 0);
-    return write(work, inpos, inlength);
+    return write(work, 0, srcEnd - inpos);
   }
 
   /** Indicate that the converter is resuable.