diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a33b0ae620..cbcfbd7de5 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 11 20:30:18 1991  Steve Chamberlain  (sac at cygnus.com)
+
+	* Makefile.in: standardize on MINUS_G to disable debugging
+	* coff-m88k.c: create coff armaps instead of bsd ones.
+	* opncls.c (bfd_close_all_done), (bfd_close): Mask out random bits
+	when calling chmod.
+
 Mon Nov 11 19:07:32 1991  Fred Fish  (fnf at cygnus.com)
 
 	* elf.c:  Additions to support ELF format core files.
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 08e715df93..ae3f44c914 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -21,8 +21,8 @@
 # $Id$
 
 srcdir = .
-destdir = /usr/local
-libdir = $(destdir)/H-$(host_alias)/T-independent/lib
+ddestdir = /usr/local
+libdir = $(ddestdir)/lib
 docdir = $(srcdir)/doc
 
 RANLIB = ranlib
@@ -31,13 +31,14 @@ AR_FLAGS = clq
 INCDIR = $(srcdir)/../include
 CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
 DEP = mkdep
+MINUS_G=-g
 
 
 #### host and target dependent Makefile fragments come in here.
 ###
 
 TARGETLIB = libbfd.a
-CFLAGS = -g $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) # -DINTEL960VERSION
+CFLAGS = $(MINUS_G) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) # -DINTEL960VERSION
 
 
 BFD_LIBS = libbfd.o opncls.o bfd.o archive.o targets.o cache.o \
diff --git a/bfd/coff-m88k.c b/bfd/coff-m88k.c
index 4f523ecee7..5f0b66fe6b 100644
--- a/bfd/coff-m88k.c
+++ b/bfd/coff-m88k.c
@@ -88,10 +88,10 @@ static reloc_howto_type howto_table[] =
 
 
 
-#define coff_write_armap bsd_write_armap
+#define coff_write_armap coff_write_armap
 
 
-bfd_target m88k_bcs_vec =
+bfd_target m88kbcs_vec =
 {
   "m88kbcs",			/* name */
   bfd_target_coff_flavour,