diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 19d074a5707df4ed13b5ce23e20025ebf0ec6701..742ccac53401f464a7eb055c9e3facfa69dfd3b0 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,8 @@
 2000-04-12  Tom Tromey  <tromey@cygnus.com>
 
+	* java/lang/natString.cc (intern): Temporarily disable finalizer
+	registration.
+
 	* java/lang/natString.cc (unintern): Added `obj' argument.
 	(intern): Register finalizer for string.
 	* java/lang/String.java (unintern): Now static; added obj
diff --git a/libjava/java/lang/natString.cc b/libjava/java/lang/natString.cc
index 175d8eb5a1bea185213f534fd085395465217a95..376a016d6c70396bb85b5d04e67343097d75aaac 100644
--- a/libjava/java/lang/natString.cc
+++ b/libjava/java/lang/natString.cc
@@ -154,7 +154,7 @@ java::lang::String::intern()
   strhash_count++;
   *ptr = this;
   // When string is GC'd, clear the slot in the hash table.
-  _Jv_RegisterFinalizer ((void *) this, unintern);
+  // _Jv_RegisterFinalizer ((void *) this, unintern);
   return this;
 }