diff --git a/gas/ChangeLog b/gas/ChangeLog
index f96c662e790..1690154eb9a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-07  Bob Wilson  <bob.wilson@acm.org>
+
+	* config/tc-xtensa.c (relaxable_section): Check for .eh_frame.
+
 2007-11-07  Eric B. Weddington  <eweddington@cso.atmel.com>
 
 	* config/tc-avr.c (mcu_types): Add ATtiny88 device.
diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index 0738f2740d6..2fd11b1e8fb 100644
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -4728,7 +4728,8 @@ xtensa_set_frag_assembly_state (fragS *fragP)
 static bfd_boolean
 relaxable_section (asection *sec)
 {
-  return (sec->flags & SEC_DEBUGGING) == 0;
+  return ((sec->flags & SEC_DEBUGGING) == 0
+	  && strcmp (sec->name, ".eh_frame") != 0);
 }