diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 6dd405833b..063fea9146 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -162,12 +162,14 @@ remote-es1800.c
 remote-hms.c
 remote-mm.c
 remote-nindy.c
+remote-st2000.c
 remote-vx.c
 remote.c
 rs6000-pinsn.c
 rs6000-tdep.c
 rs6000-xdep.c
 saber.suppress
+ser-bsd.c
 ser-go32.c
 ser-termios.c
 serial.h
@@ -234,6 +236,7 @@ tm-rs6000.h
 tm-sparc.h
 tm-spc-noun.h
 tm-spc-un.h
+tm-st2000.h
 tm-stratus.h
 tm-sun2.h
 tm-sun2os4.h
@@ -268,6 +271,7 @@ xcoffsolib.h
 xm-3b1.h
 xm-altos.h
 xm-amix.h
+xm-apollo68b.h
 xm-apollo68v.h
 xm-arm.h
 xm-bigmips.h
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8131229cdd..9c0446f26c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Thu Sep  3 09:17:05 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* a68v-xdep.c (store_inferior_registers):  Define as type void.
+	* configure.in:  Add host m68k-apollo*-bsd*.
+	* demangle.c (struct demanglers):  Use enum instead of constant
+	value to keep braindamaged HP/Apollo compiler happy.
+
 Wed Sep  2 20:45:31 1992  Per Bothner  (bothner@rtl.cygnus.com)
 
 	* utils.c (strcmp_iw):  Add a hack to allow "FOO(ARGS)" to
diff --git a/gdb/a68v-xdep.c b/gdb/a68v-xdep.c
index 9aa6aff613..ec272ca196 100644
--- a/gdb/a68v-xdep.c
+++ b/gdb/a68v-xdep.c
@@ -61,6 +61,7 @@ fetch_inferior_registers ()
    If REGNO is -1, do this for all registers.
    Otherwise, REGNO specifies which register (so we can save time).  */
 
+void
 store_inferior_registers (regno)
      int regno;
 {
diff --git a/gdb/configure.in b/gdb/configure.in
index 23ffb9e758..8cf7be787a 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -41,6 +41,8 @@ m68k-altos-*)		gdb_host=altos ;;
 
 m68k-apollo*-sysv*)	gdb_host=apollo68v ;;
 
+m68k-apollo*-bsd*)	gdb_host=apollo68b ;;
+
 m68k-att-*)		gdb_host=3b1 ;;
 
 m68k-cbm-sysv4*)	gdb_host=amix ;;
diff --git a/gdb/demangle.c b/gdb/demangle.c
index e7c835646f..1fdfdc8f63 100644
--- a/gdb/demangle.c
+++ b/gdb/demangle.c
@@ -67,7 +67,7 @@ static const struct demangler
   {CFRONT_DEMANGLING_STYLE_STRING,
      cfront_demangling,
      "ARM (cfront) style demangling"},
-  {NULL, 0, NULL}
+  {NULL, unknown_demangling, NULL}
 };
 
 /* show current demangling style. */