diff -Nur binutils-20031002.old/bfd/config.bfd binutils-20031002/bfd/config.bfd
--- binutils-20031002.old/bfd/config.bfd	2003-09-03 11:32:17.000000000 +0200
+++ binutils-20031002/bfd/config.bfd	2003-10-03 20:08:38.000000000 +0200
@@ -461,7 +461,7 @@
 	targ_cflags=-DOLD_FREEBSD_ABI_LABEL ;;
     esac
     ;;
-  i[3-7]86-*-netbsdelf* | i[3-7]86-*-netbsd*-gnu*)
+  i[3-7]86-*-netbsdelf* | i[3-7]86-*-knetbsd*-gnu)
     targ_defvec=bfd_elf32_i386_vec
     targ_selvecs=i386netbsd_vec
     ;;
diff -Nur binutils-20031002.old/bfd/configure.in binutils-20031002/bfd/configure.in
--- binutils-20031002.old/bfd/configure.in	2003-09-19 05:55:40.000000000 +0200
+++ binutils-20031002/bfd/configure.in	2003-10-03 20:10:27.000000000 +0200
@@ -231,7 +231,7 @@
 	TRAD_HEADER='"hosts/i386bsd.h"'
 	;;
 changequote(,)dnl
-  i[3-7]86-*-netbsd* | i[3-7]86-*-openbsd*)
+  i[3-7]86-*-netbsd* | i[3-7]86-*-knetbsd*-gnu | i[3-7]86-*-openbsd*)
 changequote([,])dnl
 	COREFILE=netbsd-core.lo
 	;;
diff -Nur binutils-20031002.old/gas/configure.in binutils-20031002/gas/configure.in
--- binutils-20031002.old/gas/configure.in	2003-09-30 18:17:12.000000000 +0200
+++ binutils-20031002/gas/configure.in	2003-10-03 20:13:46.000000000 +0200
@@ -267,8 +267,8 @@
       i386-*-bsd*)			fmt=aout em=386bsd ;;
       i386-*-netbsd0.8)			fmt=aout em=386bsd ;;
       i386-*-netbsdpe*)			fmt=coff em=pe ;;
-      i386-*-netbsd*-gnu*)		fmt=elf em=nbsd ;;
-      i386-*-netbsdelf*)		fmt=elf em=nbsd ;;
+      i386-*-netbsdelf* | i386-*-knetbsd*-gnu)
+					fmt=elf em=nbsd ;;
       i386-*-*n*bsd*)	case ${cpu} in
 			    x86_64)	fmt=elf em=nbsd ;;
 			    *)		fmt=aout em=nbsd ;;
diff -Nur binutils-20031002.old/gas/testsuite/gas/alpha/alpha.exp binutils-20031002/gas/testsuite/gas/alpha/alpha.exp
--- binutils-20031002.old/gas/testsuite/gas/alpha/alpha.exp	2003-09-03 11:32:21.000000000 +0200
+++ binutils-20031002/gas/testsuite/gas/alpha/alpha.exp	2003-10-03 20:21:22.000000000 +0200
@@ -22,6 +22,7 @@
 		  || [istarget *-*-freebsd*] \
 		  || [istarget *-*-kfreebsd*-gnu] \
 		  || [istarget *-*-netbsd*] ]
+		  || [istarget *-*-knetbsd*-gnu] ]
 
     if $elf {
 	run_dump_test "elf-reloc-1"
diff -Nur binutils-20031002.old/ld/configure.tgt binutils-20031002/ld/configure.tgt
--- binutils-20031002.old/ld/configure.tgt	2003-09-03 11:32:21.000000000 +0200
+++ binutils-20031002/ld/configure.tgt	2003-10-03 20:26:43.000000000 +0200
@@ -170,7 +170,7 @@
 i[3-7]86-*-solaris*)	targ_emul=elf_i386_ldso
                         targ_extra_emuls="elf_i386"
                         ;;
-i[3-7]86-*-netbsdelf* | i[3-7]86-*-netbsd*-gnu*)
+i[3-7]86-*-netbsdelf* | i[3-7]86-*-knetbsd*-gnu)
 			targ_emul=elf_i386
 			targ_extra_emuls=i386nbsd
 			;;