diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4fd08d738e..1921854fc3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2001-11-14  Jim Blandy  <jimb@redhat.com>
 
+	* s390-tdep.c (s390_get_frame_info): Initialize SP's element of
+	the frame's saved_regs array correctly.
+
 	* symfile.c (simple_read_overlay_table): Make sure we can find
 	both `_novlys' and `_ovly_table' before we try anything else;
 	print a helpful error message.
diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
index 7389637fb4..2e78f2abed 100644
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -596,6 +596,10 @@ s390_get_frame_info (CORE_ADDR pc, struct frame_extra_info *fextra_info,
       fextra_info->skip_prologue_function_start =
 	(good_prologue ? test_pc : pc);
     }
+  if (saved_regs)
+    /* The SP's element of the saved_regs array holds the old SP,
+       not the address at which it is saved.  */
+    saved_regs[S390_SP_REGNUM] = orig_sp;
   return err;
 }