diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 31387a9bdf..155c48319a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-24  Andreas Schwab  <schwab@suse.de>
+
+	* frame.c (get_frame_register_bytes): Take pseudo registers into
+	account.
+
 2008-09-23  Doug Evans  <dje@google.com>
 
 	* dcache.c (state_chars): New static global.
diff --git a/gdb/frame.c b/gdb/frame.c
index dd3e34118e..0fd21e4eab 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -809,7 +809,8 @@ get_frame_register_bytes (struct frame_info *frame, int regnum,
   /* Ensure that we will not read beyond the end of the register file.
      This can only ever happen if the debug information is bad.  */
   maxsize = -offset;
-  for (i = regnum; i < gdbarch_num_regs (gdbarch); i++)
+  for (i = regnum;
+       i < gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch); i++)
     {
       int thissize = register_size (gdbarch, i);
       if (thissize == 0)