diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 21e0c6eaa32c30e4fdfdc3e529faeb04b2e02854..5f03819a6d61134b5c2511202268089fd0a6c0cc 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1998-05-26  Per Bothner  <bothner@cygnus.com>
+
+	* language_as_string:  Handle lang_java.
+
 1998-05-26  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* decl.c (pushdecl): Don't copy the type_decl.
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 4eb7da0692bfa58ab50e3c35e0a6f5aaf9b5227b..9202b3911c37fa10c1c467986f2b904885d435d2 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -1828,6 +1828,9 @@ language_as_string (c, v)
     case lang_cplusplus:
       return "C++";
 
+    case lang_java:
+      return "Java";
+
     default:
       my_friendly_abort (355);
       return 0;