diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e66a8e90fe4..c2b0ef201fa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-09  Roger Sayle  <roger@eyesopen.com>
+	    Nicolas Setton <setton@adacore.com>
+
+	* dwarf2out.c (convert_cfa_to_fb_loc_list): Handle DW_CFA_set_loc.
+
 2006-09-10  Andreas Schwab  <schwab@suse.de>
 
 	* config/m68k/m68k.md (bungt_rev): New pattern.
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 54942235ec2..6d6080cc247 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -10397,6 +10397,7 @@ convert_cfa_to_fb_loc_list (HOST_WIDE_INT offset)
   for (cfi = fde->dw_fde_cfi; cfi; cfi = cfi->dw_cfi_next)
     switch (cfi->dw_cfi_opc)
       {
+      case DW_CFA_set_loc:
       case DW_CFA_advance_loc1:
       case DW_CFA_advance_loc2:
       case DW_CFA_advance_loc4: