diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a774aadc28..0da7299021 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-18  Andrew Cagney  <cagney@redhat.com>
+
+	* m68hc11-tdep.c (m68hc11_gdbarch_init): Do not set
+	"dwarf2_build_frame_info".  Append "m68k_frame_sniffer" instead of
+	"m68k_frame_p".
+	(m68hc11_frame_sniffer): Replace "m68hc11_frame_p".
+
 2003-08-18  Mark Kettenis  <kettenis@gnu.org>
 
 	* x86-64-tdep.c (x86_64_dwarf_regmap): Remove trailing whitespace.
diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c
index 223eb0991a..7ec4edd017 100644
--- a/gdb/m68hc11-tdep.c
+++ b/gdb/m68hc11-tdep.c
@@ -961,7 +961,7 @@ static const struct frame_unwind m68hc11_frame_unwind = {
 };
 
 const struct frame_unwind *
-m68hc11_frame_p (CORE_ADDR pc)
+m68hc11_frame_sniffer (struct frame_info *next_frame)
 {
   return &m68hc11_frame_unwind;
 }
@@ -1581,9 +1581,8 @@ m68hc11_gdbarch_init (struct gdbarch_info info,
 
   /* Hook in the DWARF CFI frame unwinder.  */
   frame_unwind_append_sniffer (gdbarch, dwarf2_frame_sniffer);
-  set_gdbarch_dwarf2_build_frame_info (gdbarch, dwarf2_build_frame_info);
 
-  frame_unwind_append_predicate (gdbarch, m68hc11_frame_p);
+  frame_unwind_append_sniffer (gdbarch, m68hc11_frame_sniffer);
   frame_base_set_default (gdbarch, &m68hc11_frame_base);
   
   /* Methods for saving / extracting a dummy frame's ID.  The ID's