diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6cc77e98b2..c33c8b53ab 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-05  Mark Kettenis  <kettenis@jive.nl>
+
+	* dwarf2-frame.c (decode_frame_entry_1): Correctly skip
+	personality routine in a CIE augmentation.
+
 2004-11-05  Felix Lee  <felix+log1@specifixinc.com>
 
 	* stack.c (set_current_sal_from_frame): New function.
diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index ba969277fb..39722cc1bc 100644
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -1381,7 +1381,9 @@ decode_frame_entry_1 (struct comp_unit *unit, char *start, int eh_frame_p)
 	  else if (*augmentation == 'P')
 	    {
 	      /* Skip.  */
-	      buf += size_of_encoded_value (*buf++);
+	      unsigned char encoding = *buf++;
+	      read_encoded_value (unit, encoding, buf, &bytes_read);
+	      buf += bytes_read;
 	      augmentation++;
 	    }