diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 48dc795d4d5f7c2990e230a9f63308f62afab183..1203410133e0e5f8040678395355429a5c91aa06 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-28  Jeffrey Oldham  <oldham@codesourcery.com>
+
+	* jvgenmain.c (do_mangle_classname): End string constant with '\0'.
+
 2001-03-28  Richard Henderson  <rth@redhat.com>
 
 	IA-64 ABI Exception Handling:
diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c
index 414ccded13ad7a92476838ce861b592e83c22c8a..4cab1f78360f39167098c06340e71b0638f178af 100644
--- a/gcc/java/jvgenmain.c
+++ b/gcc/java/jvgenmain.c
@@ -168,5 +168,6 @@ do_mangle_classname (string)
     }
   append_gpp_mangled_name (&ptr [-count], count);
   obstack_grow (mangle_obstack, "6class$E", 8);
+  obstack_1grow (mangle_obstack, '\0');
   return obstack_finish (mangle_obstack);
 }