diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 29b5db7fec9f..e8ec6e8c3e32 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-12  Tom Tromey  <tromey@redhat.com>
+
+	* gnu/gcj/runtime/StringBuffer.java
+	(ensureCapacity_unsynchronized): Ensure we always get at least
+	`minimumCapacity' characters in new buffer.
+
 2001-12-11  Tom Tromey  <tromey@redhat.com>
 
 	* java/lang/String.java (String): New constructor.
diff --git a/libjava/gnu/gcj/runtime/StringBuffer.java b/libjava/gnu/gcj/runtime/StringBuffer.java
index 403f952c951d..3cbcef6fe67e 100644
--- a/libjava/gnu/gcj/runtime/StringBuffer.java
+++ b/libjava/gnu/gcj/runtime/StringBuffer.java
@@ -130,7 +130,7 @@ public final class StringBuffer
   {
     if (minimumCapacity > value.length)
       {
-	minimumCapacity = value.length * 2 + 2;
+	minimumCapacity = Math.max (minimumCapacity, value.length * 2 + 2);
 	char[] nb = new char[minimumCapacity];
 	System.arraycopy(value, 0, nb, 0, count);
 	value = nb;