diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index bcfe74954b..d6df14c560 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+Wed Nov  1 11:45:07 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-rs6000.c (_bfd_xcoff_sizeof_headers): Change from macro to
+	static function.
+	* xcofflink.c (_bfd_xcoff_bfd_link_hash_table_create): Set
+	full_aouthdr flag here...
+	(_bfd_xcoff_bfd_final_link): ...not here.
+
 Tue Oct 31 12:52:02 1995  Fred Fish  <fnf@cygnus.com>
 
 	* libelf.h:  Rename to elf-bfd.h to avoid conflict with
diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c
index cc65a2a533..a3c66129d9 100644
--- a/bfd/xcofflink.c
+++ b/bfd/xcofflink.c
@@ -579,6 +579,11 @@ _bfd_xcoff_bfd_link_hash_table_create (abfd)
   ret->textro = false;
   ret->gc = false;
 
+  /* The linker will always generate a full a.out header.  We need to
+     record that fact now, before the sizeof_headers routine could be
+     called.  */
+  xcoff_data (abfd)->full_aouthdr = true;
+
   return &ret->root;
 }
 
@@ -2887,7 +2892,6 @@ _bfd_xcoff_bfd_final_link (abfd, info)
 		  + xcoff_hash_table (info)->ldhdr.l_nsyms * LDSYMSZ));
 
   xcoff_data (abfd)->coff.link_info = info;
-  xcoff_data (abfd)->full_aouthdr = true;
 
   finfo.strtab = _bfd_stringtab_init ();
   if (finfo.strtab == NULL)