diff --git a/gas/ChangeLog b/gas/ChangeLog
index ec03c7a7083..851e4d43ed6 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-15  Jan Beulich  <jbeulich@novell.com>
+
+	* dw2gencfi.c (output_cfi_insn): Adjust DW_CFA_def_cfa_sf generation
+	to emit a signed and factored offset. Adjust DW_CFA_def_cfa_offset_sf
+	generation to emit a factored offset.
+
 2004-12-10  Ian Lance Taylor  <ian@wasabisystems.com>
 
 	* config/tc-mips.c (macro) [M_LA_AB]: Give an error for a offset
diff --git a/gas/dw2gencfi.c b/gas/dw2gencfi.c
index 3bfd14f46ac..687815cf60e 100644
--- a/gas/dw2gencfi.c
+++ b/gas/dw2gencfi.c
@@ -728,7 +728,7 @@ output_cfi_insn (struct cfi_insn_data *insn)
 	{
 	  out_one (DW_CFA_def_cfa_sf);
 	  out_uleb128 (insn->u.ri.reg);
-	  out_uleb128 (offset);
+	  out_sleb128 (offset / DWARF2_CIE_DATA_ALIGNMENT);
 	}
       else
 	{
@@ -750,7 +750,7 @@ output_cfi_insn (struct cfi_insn_data *insn)
       if (offset < 0)
 	{
 	  out_one (DW_CFA_def_cfa_offset_sf);
-	  out_sleb128 (offset);
+	  out_sleb128 (offset / DWARF2_CIE_DATA_ALIGNMENT);
 	}
       else
 	{