diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 62a7824e915..fa4b413b529 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -3,6 +3,9 @@ Sat Sep 23 01:22:23 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 	* mdebugread.c (parse_partial_symbols):  Reset includes_used
 	and dependencies_used after finishing the partial symbol table.
 
+	* rs6000-tdep.c (push_dummy_frame):  Handle lr_offset of zero
+	correctly.
+
 	* rs6000-nat.c (xcoff_relocate_core):  Don't relocate data
 	addresses for the main objfile if DONT_RELOCATE_SYMFILE_OBJFILE
 	is defined.
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index ca4bb72a0d0..e715399c45d 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -489,7 +489,8 @@ push_dummy_frame ()
   flush_cached_frames ();
 
   /* save program counter in link register's space. */
-  write_memory (sp+fdata.lr_offset, pc_targ, 4);
+  write_memory (sp + (fdata.lr_offset ? fdata.lr_offset : DEFAULT_LR_SAVE),
+	        pc_targ, 4);
 
   /* save all floating point and general purpose registers here. */