diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c8e1b1a7bd..3bdff31851 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Tue May 28 16:15:47 1996  Geoffrey Noer  <noer@cygnus.com>
+
+	* remote-mips.c: cannot use EINVAL for breakpoint test since
+	its value varies for different hosts (e.g. go32's is 19, while
+	sunos is 22).  Changed to hardcoded 22 since that is what the
+	mips boards return.
+
 Tue May 28 11:14:58 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
 	* configure: Regenerated.
diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
index 13fce91dc6..f57c47f57b 100644
--- a/gdb/remote-mips.c
+++ b/gdb/remote-mips.c
@@ -2307,7 +2307,7 @@ common_breakpoint (cmd, addr, mask, flags)
 
   if (rerrflg != 0)
     {
-      if (rresponse != EINVAL)
+      if (rresponse != 22) /* invalid argument */
 	fprintf_unfiltered (stderr, "common_breakpoint (0x%x):  Got error: 0x%x\n",
 			    addr, rresponse);
       return 1;