diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4f6b77248fd..237e6648263 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,13 @@
+Tue Oct 22 11:28:39 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* obj.h (struct format_ops): Add frob_file_after_relocs field.
+	* config/obj-multi.h (obj_frob_file_after_relocs): Define.
+	* config/obj-ecoff.c (ecoff_format_ops): Initialize new
+	frob_file_after_relocs field.
+	* config/obj-elf.c (elf_format_ops): Likewise.
+	* config/tc-mips.c: Undefine obj_frob_file_after_relocs before
+	including obj-elf.h.
+
 Mon Oct 21 11:38:30 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* config/tc-mips.c (cons_fix_new_mips): Only treat 8 byte reloc