diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2645af95fd..0b7ddc576a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-30  Bob Wilson  <bob.wilson@acm.org>
+
+	* config/tc-xtensa.c (xtensa_frob_label): Disallow labels in bundles.
+
 2005-09-30  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* Makefile.am: Run "make dep-am".
diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index c93a4dfafe..3b551c4e58 100644
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -5030,7 +5030,15 @@ xtensa_init_fix_data (fixS *x)
 void
 xtensa_frob_label (symbolS *sym)
 {
-  float freq = get_subseg_target_freq (now_seg, now_subseg);
+  float freq;
+
+  if (cur_vinsn.inside_bundle)
+    {
+      as_bad (_("labels are not valid inside bundles"));
+      return;
+    }
+
+  freq = get_subseg_target_freq (now_seg, now_subseg);
 
   /* Since the label was already attached to a frag associated with the
      previous basic block, it now needs to be reset to the current frag.  */