diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 326025db7c..60d00037bc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -24,6 +24,7 @@
 	(write_register): Ditto.
 	(build_regcache): Allocate enough register_valid space for
 	pseudo-registers as well as normal (real) ones.
+	* parse.c (target_map_name_to_register): Include pseudo-regs.
 	
 Tue Jul 11 19:45:42 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
diff --git a/gdb/parse.c b/gdb/parse.c
index a39c21dcfc..d17dd9f278 100644
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -131,7 +131,15 @@ target_map_name_to_register (str, len)
 	return i;
       }
 
-  /* Try standard aliases */
+  /* Try pseudo-registers, if any. */
+  for (i = NUM_REGS; i < NUM_REGS + NUM_PSEUDO_REGS; i++)
+    if (REGISTER_NAME (i) && len == strlen (REGISTER_NAME (i))
+	&& STREQN (str, REGISTER_NAME (i), len))
+      {
+	return i;
+      }
+
+  /* Try standard aliases. */
   for (i = 0; i < num_std_regs; i++)
     if (std_regs[i].name && len == strlen (std_regs[i].name)
 	&& STREQN (str, std_regs[i].name, len))