diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index cd50d64f93b..87cdfb9a7c6 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-15  Mark Kettenis  <kettenis@gnu.org>
+
+	* gdb.base/attach.exp: Use -1 for the ID of a nonexistent process
+	on *-*-*bsd* instead of *-*-freebsd*.
+
 2003-06-14  Andrew Cagney  <cagney@redhat.com>
 
 	* gdb.base/store.exp: Test longest and doublest.  Test all
diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp
index 6adb6e3aa4b..66e9f0ec311 100644
--- a/gdb/testsuite/gdb.base/attach.exp
+++ b/gdb/testsuite/gdb.base/attach.exp
@@ -111,9 +111,10 @@ proc do_attach_tests {} {
    # the default.  However, there are a few exceptions.
    #
    set boguspid 0
-   if { [istarget "*-*-freebsd*"] } {
+   if { [istarget "*-*-*bsd*"] } {
        # In FreeBSD 5.0, PID 0 is used for "swapper".  Use -1 instead
-       # (which should have the desired effect on any version of FreeBSD).
+       # (which should have the desired effect on any version of
+       # FreeBSD, and probably other *BSD's too).
        set boguspid -1
    }
    send_gdb "attach $boguspid\n"