diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index bc8774b6a00..86c645092fe 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-18  Jesse Rosenstock <jmr@ugcs.caltech.edu>
+
+        * java/nio/charset/CoderResult.java (Cache.get): Fix a bug
+        that was causing CoderResults to be cached, not WeakReferences
+        to CoderResults.
+	
 2002-11-18  Joerg Brunsmann  <joerg_brunsmann@yahoo.de>
 
 	* java/security/KeyStore.java (getInstance): Fix
diff --git a/libjava/java/nio/charset/CoderResult.java b/libjava/java/nio/charset/CoderResult.java
index 69deadcc4f0..49c66637c79 100644
--- a/libjava/java/nio/charset/CoderResult.java
+++ b/libjava/java/nio/charset/CoderResult.java
@@ -182,7 +182,7 @@ public class CoderResult
       if (cr == null)
         {
           cr = make (length);
-          cache.put (len, cr);
+          cache.put (len, new WeakReference (cr));
         }
 
       return cr;