diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0e6d839971f..cd28cda1ef0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+Thu Dec 16 13:08:01 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* config/m68k/nm-hp300bsd.h: Correctly identify 4.3BSD vs 4.4BSD.
+
+	* config/m68k/tm-hp300bsd.h (REMOTE_BPT_VECTOR): Define.
+
+	* config/m68k/tm-m68k.h (REMOTE_BPT_VECTOR): Allow targets to
+	override.
+	(REMOTE_BREAKPOINT): Likewise.
+
 Mon Dec 13 20:17:39 1993  Per Bothner  (bothner@kalessin.cygnus.com)
 
 	Implement support for Chill POWERSETs.
diff --git a/gdb/config/m68k/nm-hp300bsd.h b/gdb/config/m68k/nm-hp300bsd.h
index b05b3889404..baa3b24572e 100644
--- a/gdb/config/m68k/nm-hp300bsd.h
+++ b/gdb/config/m68k/nm-hp300bsd.h
@@ -20,7 +20,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Detect whether this is 4.3 or 4.4.  */
 
 #include <errno.h>
-#ifdef	EPROCUNAVAIL
+#include <sys/param.h>
+#ifdef	BSD4_4
 
 /* BSD 4.4 alpha or better */
 
diff --git a/gdb/config/m68k/tm-hp300bsd.h b/gdb/config/m68k/tm-hp300bsd.h
index d65a673f178..37bb874dca4 100644
--- a/gdb/config/m68k/tm-hp300bsd.h
+++ b/gdb/config/m68k/tm-hp300bsd.h
@@ -30,6 +30,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This is the vector number used by traps to indicate a breakpoint. */
 
 #define BPT_VECTOR 0x2
+#define REMOTE_BPT_VECTOR 0xf
 
 #define TARGET_NBPG 4096
 
diff --git a/gdb/config/m68k/tm-m68k.h b/gdb/config/m68k/tm-m68k.h
index 7a8c52a33a6..14b71cff79c 100644
--- a/gdb/config/m68k/tm-m68k.h
+++ b/gdb/config/m68k/tm-m68k.h
@@ -68,10 +68,15 @@ extern CORE_ADDR m68k_saved_pc_after_call PARAMS ((struct frame_info *));
 #define BREAKPOINT {0x4e, (0x40 | BPT_VECTOR)}
 #endif
 
-/* We always use vector 1 for the "remote" target.  This is hardcoded in
-   m68k-stub.c.  */
+/* We default to vector 1 for the "remote" target, but allow targets
+   to override.  */
+#if !defined (REMOTE_BPT_VECTOR)
 #define REMOTE_BPT_VECTOR 1
+#endif
+
+#if !defined (REMOTE_BREAKPOINT)
 #define REMOTE_BREAKPOINT {0x4e, (0x40 | REMOTE_BPT_VECTOR)}
+#endif
 
 /* If your kernel resets the pc after the trap happens you may need to
    define this before including this file.  */