diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 179bffb3c1..c164aa1e0c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-14  Mark Kettenis  <kettenis@gnu.org>
+
+	* i386-tdep.c (i386_analyze_frame_setup): Add missing encodings
+	for `subl' and `xorl' instructions.
+
 2003-12-13  Jim Blandy  <jimb@redhat.com>
 
 	* dwarf2read.c (dwarf2_add_member_fn, read_structure_scope):
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 973fa63e43..4ee9fa46f1 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -508,9 +508,13 @@ i386_analyze_frame_setup (CORE_ADDR pc, CORE_ADDR current_pc,
 	    subl %edx, %edx
 	    subl %eax, %eax
 
+	 Because of the symmetry, there are actually two ways to
+	 encode these instructions; with opcode bytes 0x29 and 0x2b
+	 for `subl' and opcode bytes 0x31 and 0x33 for `xorl'.
+
 	 Make sure we only skip these instructions if we later see the
 	 `movl %esp, %ebp' that actually sets up the frame.  */
-      while (op == 0x29 || op == 0x31)
+      while (op == 0x29 || op == 0x2b || op == 0x31 || op == 0x33)
 	{
 	  op = read_memory_unsigned_integer (pc + skip + 2, 1);
 	  switch (op)