diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 127b512dfa..a44bdc5e3b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-19  Jim Blandy  <jimb@redhat.com>
+
+	* c-lang.c (c_emit_char): Print ASCII 11 as '\v', to match
+	ISO C, and our parser.  Print ASCII 0 as '\0', since that's what
+	people are used to seeing.
+
 2001-12-18  Jim Blandy  <jimb@redhat.com>
 
 	* c-lang.c (c_printstr, c_builtin_types, cplus_builtin_types): 
diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index c7cfd29b03..9e92d7e909 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -67,12 +67,18 @@ c_emit_char (register int c, struct ui_file *stream, int quoter)
 	case '\r':
 	  fputs_filtered ("\\r", stream);
 	  break;
+        case '\013':
+          fputs_filtered ("\\v", stream);
+          break;
 	case '\033':
 	  fputs_filtered ("\\e", stream);
 	  break;
 	case '\007':
 	  fputs_filtered ("\\a", stream);
 	  break;
+        case '\0':
+          fputs_filtered ("\\0", stream);
+          break;
 	default:
 	  fprintf_filtered (stream, "\\%.3o", (unsigned int) c);
 	  break;