diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 61707e8429..1e3d1962ee 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-28  Ian Lance Taylor  <iant@google.com>
+
+	* dwarf.c (display_debug_frames): If do_debug_frames_interp,
+	DW_CFA_restore goes to DW_CFA_undefined, not DW_CFA_unreferenced.
+
 2011-10-28  Walter Lee  <walt@tilera.com>
 
 	* NEWS: Mention addition of TILEPro and TILE-Gx support.
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index d89a861b55..1196246194 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -5110,6 +5110,9 @@ display_debug_frames (struct dwarf_section *section,
 		{
 		  fc->col_type[opa] = cie->col_type[opa];
 		  fc->col_offset[opa] = cie->col_offset[opa];
+		  if (do_debug_frames_interp
+		      && fc->col_type[opa] == DW_CFA_unreferenced)
+		    fc->col_type[opa] = DW_CFA_undefined;
 		}
 	      break;