diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 70830d5bc92..233491a9404 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 Fri Sep 20 16:10:52 1991  John Gilmore  (gnu at cygnus.com)
 
+	* language.c (set_language_command):  Print useful help message,
+	and restore the language string after giving help.
+	* valprint.c (typedef_print):  Print typedef in C or M2.
+	* symtab.c (list_symbols):  Use it.
 	* main.c (main):  Avoid any output before (gdb) prompt when -q.
 	* language.c (set_language_command):  Handle errors by restoring
 	the language string to its current state (fix from A. Beers).
diff --git a/gdb/language.c b/gdb/language.c
index 296a6d53b52..4cef749b685 100644
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -121,8 +121,10 @@ set_language_command (str, from_tty)
   if (!language || !language[0]) {
     printf("The currently understood settings are:\n\n\
 local or auto    Automatic setting based on source file\n\
-c or cc          Always parse in C syntax\n\
-mod or m2        Always parse in Modula-2 syntax\n");
+c                Use the C language\n\
+modula-2         Use the Modula-2 language\n");
+    /* Restore the silly string. */
+    set_language(current_language->la_language);
     return;
   }
 
@@ -1056,7 +1058,7 @@ _initialize_language()
 
    set = add_set_cmd ("language", class_support, var_string_noescape,
 		      (char *)&language,
-		      "Set the current working language.",
+		      "Set the current source language.",
 		      &setlist);
    show = add_show_from_set (set, &showlist);
    set->function = set_language_command;