diff --git a/gas/ChangeLog b/gas/ChangeLog
index 851e4d43ed..fe30f9d927 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-15 Jan Beulich  <jbeulich@novell.com>
+
+	* dw2gencfi.c (dot.cfi.startproc): Clear cur_cfa_offset so
+	'.cfi_startproc simple' doesn't inherit the old value.
+
 2004-12-15  Jan Beulich  <jbeulich@novell.com>
 
 	* dw2gencfi.c (output_cfi_insn): Adjust DW_CFA_def_cfa_sf generation
diff --git a/gas/dw2gencfi.c b/gas/dw2gencfi.c
index 687815cf60..c77efbf9a3 100644
--- a/gas/dw2gencfi.c
+++ b/gas/dw2gencfi.c
@@ -607,6 +607,7 @@ dot_cfi_startproc (int ignored ATTRIBUTE_UNUSED)
     }
   demand_empty_rest_of_line ();
 
+  cur_cfa_offset = 0;
   if (!simple)
     tc_cfi_frame_initial_instructions ();
 }