diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 33ab94afa0..05d0fc9f02 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-23  Michael Snyder  <msnyder@redhat.com>
+
+	* printcmd.c (address_info): Restore quotes in output.
+	* valops.c (value_of_local): Restore quotes in error message.
+
 2002-10-23  Elena Zannoni  <ezannoni@redhat.com>
 
 	* symtab.c (symbol_demangled_name): New function.
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 2bf5fdf4d0..28697f2019 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -1106,9 +1106,9 @@ address_info (char *exp, int from_tty)
 				   current_language->la_language, DMGL_ANSI);
 	  printf_filtered ("\" is a field of the local class variable ");
 	  if (current_language->la_language == language_objc)
-	    printf_filtered ("'self'\n");	/* ObjC equivalent of "this" */
+	    printf_filtered ("`self'\n");	/* ObjC equivalent of "this" */
 	  else
-	    printf_filtered ("'this'\n");
+	    printf_filtered ("`this'\n");
 	  return;
 	}
 
diff --git a/gdb/valops.c b/gdb/valops.c
index b61355f68a..6fcd824324 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -3330,7 +3330,7 @@ value_of_local (const char *name, int complain)
   if (!func)
     {
       if (complain)
-	error ("no %s in nameless context", name);
+	error ("no `%s' in nameless context", name);
       else
 	return 0;
     }
@@ -3340,7 +3340,7 @@ value_of_local (const char *name, int complain)
   if (i <= 0)
     {
       if (complain)
-	error ("no args, no '%s'", name);
+	error ("no args, no `%s'", name);
       else
 	return 0;
     }
@@ -3351,14 +3351,14 @@ value_of_local (const char *name, int complain)
   if (sym == NULL)
     {
       if (complain)
-	error ("current stack frame does not contain a variable named \"%s\"", name);
+	error ("current stack frame does not contain a variable named `%s'", name);
       else
 	return NULL;
     }
 
   ret = read_var_value (sym, selected_frame);
   if (ret == 0 && complain)
-    error ("%s argument unreadable", name);
+    error ("`%s' argument unreadable", name);
   return ret;
 }