diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1565ac4684..72a67b06d7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 Mon Oct 18 10:28:08 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+	* hppa-tdep.c (restore_pc_queue): Call target_terminal_ours after
+	done stepping the inferior.
+
 	* c-exp.y: Remove never-used (because of shift/reduce conflicts)
 	rules for pointers to members.
 	* Makefile.in: Remove notice about expected shift/reduce conflicts.
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 058c874150..08f9e4ed2e 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -868,6 +868,11 @@ restore_pc_queue (fsr)
 
   for (insn_count = 0; insn_count < 3; insn_count++)
     {
+      /* FIXME: What if the inferior gets a signal right now?  Want to
+	 merge this into wait_for_inferior (as a special kind of
+	 watchpoint?  By setting a breakpoint at the end?  Is there
+	 any other choice?  Is there *any* way to do this stuff with
+	 ptrace() or some equivalent?).  */
       resume (1, 0);
       target_wait(inferior_pid, &w);
 
@@ -881,6 +886,7 @@ restore_pc_queue (fsr)
           return 0;
         }
     }
+  target_terminal_ours ();
   fetch_inferior_registers (-1);
   return 1;
 }