diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5af57bb7fbe..b70376a0abd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-12  Mark Kettenis  <kettenis@gnu.org>
+
+	* configure.tgt (i[3456]86-*-unixware*, i[3456]86-*-unixware2*):
+	Remove targets.  These are canonicalized to i386-*-sysv4.2uw by
+	config.sub.
+
 2002-05-12  Daniel Jacobowitz  <drow@mvista.com>
 
 	* Makefile.in: Update dependencies.
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 7a9a3ac2509..bc963b182e2 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -103,8 +103,6 @@ i[3456]86-*-solaris*)	gdb_target=i386sol2 ;;
 i[3456]86-*-sysv4.2*)	gdb_target=i386v42mp ;;
 i[3456]86-*-sysv4*)	gdb_target=i386v4 ;;
 i[3456]86-*-sysv5*)	gdb_target=i386v42mp ;;
-i[3456]86-*-unixware2*)	gdb_target=i386v42mp ;;
-i[3456]86-*-unixware*)	gdb_target=i386v4 ;;
 i[3456]86-*-sco3.2v4*)	gdb_target=i386sco4 ;;
 i[3456]86-*-sco3.2v5*)	gdb_target=i386sco5 ;;
 i[3456]86-*-sco*)	gdb_target=i386v ;;
@@ -260,7 +258,8 @@ sparc-*-coff*)		gdb_target=sparc-em ;;
 sparc-*-elf*)		gdb_target=sparc-em ;;
 sparc-*-linux*)		gdb_target=linux ;;
 sparc-*-lynxos*)	gdb_target=sparclynx ;;
-sparc-*-netbsd*)	gdb_target=nbsd ;;
+sparc-*-netbsd* | sparc-*-openbsd*)
+			gdb_target=nbsd ;;
 sparc-*-solaris2*)	gdb_target=sun4sol2 ;;
 sparc-*-sunos4*)	gdb_target=sun4os4 ;;
 sparc-*-sunos5*)	gdb_target=sun4sol2 ;;