diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b0c6d62eb4..2643d4a853 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-11  Mark Kettenis  <kettenis@gnu.org>
+
+	* i386-tdep.c: Include "dummy-frame.h".
+	(i386_frame_chain, i386_frame_saved_pc): Replace
+	DEPRECATED_PC_IN_CALL_DUMMY with call to pc_in_dummy_frame.
+	(i386_gdbarch_init): Don't set deprecated_pc_in_call_dummy.
+
 2002-12-10  Andrew Cagney  <cagney@redhat.com>
 
 	* gdbarch.sh (DEPRECATED_INIT_FRAME_PC): Rename INIT_FRAME_PC.
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 5d76460831..501c15a96f 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -38,6 +38,7 @@
 #include "value.h"
 #include "gdb_assert.h"
 #include "reggroups.h"
+#include "dummy-frame.h"
 
 #include "i386-tdep.h"
 #include "i387-tdep.h"
@@ -509,7 +510,7 @@ i386_frameless_signal_p (struct frame_info *frame)
 static CORE_ADDR
 i386_frame_chain (struct frame_info *frame)
 {
-  if (DEPRECATED_PC_IN_CALL_DUMMY (frame->pc, 0, 0))
+  if (pc_in_dummy_frame (frame->pc))
     return frame->frame;
 
   if (get_frame_type (frame) == SIGTRAMP_FRAME
@@ -566,7 +567,7 @@ i386_sigtramp_saved_sp (struct frame_info *frame)
 static CORE_ADDR
 i386_frame_saved_pc (struct frame_info *frame)
 {
-  if (DEPRECATED_PC_IN_CALL_DUMMY (frame->pc, 0, 0))
+  if (pc_in_dummy_frame (frame->pc))
     {
       ULONGEST pc;
 
@@ -1598,8 +1599,6 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 					   i386_register_convert_to_virtual);
   set_gdbarch_register_convert_to_raw (gdbarch, i386_register_convert_to_raw);
 
-  set_gdbarch_deprecated_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_at_entry_point);
-
   /* "An argument's size is increased, if necessary, to make it a
      multiple of [32-bit] words.  This may require tail padding,
      depending on the size of the argument" -- from the x86 ABI.  */