diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7baa02adfef..9461c209adf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2004-02-22  Andrew Cagney  <cagney@redhat.com>
 
+	* hppa-tdep.c (hppa_breakpoint_from_pc): Make "breakpoint"
+	unsigned.
+	(hppa_frame_find_saved_regs): Fix "std" instruction pattern
+	
 	* config/pa/tm-hppa.h: Update copyright.
 	(DEPRECATED_INIT_FRAME_PC): Delete macro.
 	(deprecated_init_frame_pc_default): Delete declaration.
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 3cf05cf1d52..94124798e10 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -702,7 +702,7 @@ find_unwind_entry (CORE_ADDR pc)
 const unsigned char *
 hppa_breakpoint_from_pc (CORE_ADDR *pc, int *len)
 {
-  static const char breakpoint[] = {0x00, 0x01, 0x00, 0x04};
+  static const unsigned char breakpoint[] = {0x00, 0x01, 0x00, 0x04};
   (*len) = sizeof (breakpoint);
   return breakpoint;
 }
@@ -4149,7 +4149,7 @@ hppa_frame_find_saved_regs (struct frame_info *frame_info,
 	      && extract_14 (inst) >= 0)
 	    frame_saved_regs[reg] = get_frame_base (frame_info);
 	  /* A std has explicit post_modify forms.  */
-	  else if ((inst & 0xfc00000c0) == 0x70000008)
+	  else if ((inst & 0xfc00000c) == 0x70000008)
 	    frame_saved_regs[reg] = get_frame_base (frame_info);
 	  else
 	    {