diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a04b72bbc0a..accd556272f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,15 @@
+Wed Apr 17 12:08:24 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* pe{,i}-ppc.c (PPC_PE): Define instead of PPC, so that compiling
+	on Solaris PowerPC systems doesn't get confused.
+
+	* ccffcode.h (coff_write_object_contents): Use #ifdef PPC_PE, not
+	#ifdef PPC.
+
+	* elfcore.h (bfd_prstatus, bfd_fpregset): Add thread argument.
+	(elf_corefile_note): If HAVE_SYS_PROCFS_H is not defined, don't
+	update did_reg and did_reg2.
+
 Wed Apr 17 13:07:37 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* linker.c (_bfd_generic_link_add_one_symbol): When calling the
diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index 245b0ecf71a..4bec6f051e6 100644
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -2642,7 +2642,7 @@ coff_write_object_contents (abfd)
 #define __A_MAGIC_SET__
     internal_a.magic = ZMAGIC;
 #endif 
-#if defined(PPC)
+#if defined(PPC_PE)
 #define __A_MAGIC_SET__
     internal_a.magic = IMAGE_NT_OPTIONAL_HDR_MAGIC;
 #endif
@@ -2700,7 +2700,7 @@ coff_write_object_contents (abfd)
 	return false;
     }
 #ifdef COFF_IMAGE_WITH_PE
-#ifdef PPC
+#ifdef PPC_PE
   else if ((abfd->flags & EXEC_P) != 0)
     {
       bfd_byte b;