diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index efec4609628..b72eaac64e8 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-11  Tom Tromey  <tromey@redhat.com>
+
+	* lex.c (java_init_lex): Define wfl_to_string as
+	gnu.gcj.runtime.StringBuffer unless generating bytecode.
+
 2001-12-11  Jeff Sturm  <jsturm@one-point.com>
 
 	* class.c (make_method_value): Use null_pointer_node to
diff --git a/gcc/java/lex.c b/gcc/java/lex.c
index 0b7e93d6032..e0595e921a0 100644
--- a/gcc/java/lex.c
+++ b/gcc/java/lex.c
@@ -118,7 +118,10 @@ java_init_lex (finput, encoding)
     wfl_append = build_expr_wfl (get_identifier ("append"), NULL, 0, 0);
   if (!wfl_string_buffer)
     wfl_string_buffer = 
-      build_expr_wfl (get_identifier ("java.lang.StringBuffer"), NULL, 0, 0);
+      build_expr_wfl (get_identifier (flag_emit_class_files
+				      ? "java.lang.StringBuffer"
+				      : "gnu.gcj.runtime.StringBuffer"),
+		      NULL, 0, 0);
   if (!wfl_to_string)
     wfl_to_string = build_expr_wfl (get_identifier ("toString"), NULL, 0, 0);