diff --git a/gas/ChangeLog b/gas/ChangeLog
index 28f5c530fc9..b9f53e0e708 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-02  James E Wilson  <wilson@specifix.com>
+
+	* config/tc-ia64.c (emit_one_bundle): For IA64_OPCODE_LAST, if we
+	change the template, then clear md.slot[curr].end_of_insn_group.
+
 2006-02-28  Jan Beulich  <jbeulich@novell.com>
 
 	* macro.c (get_any_string): Don't insert quotes for <>-quoted input.
diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index ec6bd61325b..426b60f589a 100644
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -6855,6 +6855,10 @@ emit_one_bundle ()
 	         changing NOPs in front of this slot.  */
 	      for (j = i; j < 3; ++j)
 	        insn[j] = nop[ia64_templ_desc[required_template].exec_unit[j]];
+
+	      /* We just picked a template that includes the stop bit in the
+		 middle, so we don't need another one emitted later.  */
+	      md.slot[curr].end_of_insn_group = 0;
 	    }
 	  template = required_template;
 	}