diff --git a/devel/binutils/stable/Makefile b/devel/binutils/stable/Makefile
index 0c4a14c6744..dc31209b49b 100644
--- a/devel/binutils/stable/Makefile
+++ b/devel/binutils/stable/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2003/06/05 23:39:47 brad Exp $
+# $OpenBSD: Makefile,v 1.16 2003/06/08 19:02:58 brad Exp $
 
 COMMENT=		"GNU development tools"
 
@@ -51,7 +51,6 @@ FILES=			ar nm-new objdump ranlib size strings strip-new
 post-extract:
 	@cp -f ${FILESDIR}/{i386obsd.sh,sparcobsd.sh,m68kobsd.sh} \
 		${WRKSRC}/ld/emulparams
-	@cp -f ${FILESDIR}/te-obsd.h ${WRKSRC}/gas/config
 
 post-patch:
 	@cd ${WRKSRC}/bfd && AUTOCONF_VERSION=${AUTOCONF_VERSION} autoconf
diff --git a/devel/binutils/stable/files/te-obsd.h b/devel/binutils/stable/files/te-obsd.h
deleted file mode 100644
index 305f7077a32..00000000000
--- a/devel/binutils/stable/files/te-obsd.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#define TE_OpenBSD	1
-
-/* We want [0-9][bf] style local temporary labels.  */
-#define LOCAL_LABELS_FB	1
-
-#include "obj-format.h"
diff --git a/devel/binutils/stable/patches/patch-gas_configure_in b/devel/binutils/stable/patches/patch-gas_configure_in
index 3f000bdbd38..5304c9eb766 100644
--- a/devel/binutils/stable/patches/patch-gas_configure_in
+++ b/devel/binutils/stable/patches/patch-gas_configure_in
@@ -1,7 +1,26 @@
-$OpenBSD: patch-gas_configure_in,v 1.6 2003/06/07 23:35:49 brad Exp $
+$OpenBSD: patch-gas_configure_in,v 1.7 2003/06/08 19:02:58 brad Exp $
 --- gas/configure.in.orig	Wed Oct 30 12:07:32 2002
-+++ gas/configure.in	Fri Jun  6 14:33:12 2003
-@@ -260,7 +260,14 @@ changequote([,])dnl
++++ gas/configure.in	Sun Jun  8 15:06:52 2003
+@@ -180,7 +180,7 @@ changequote([,])dnl
+       alpha*-*-linuxecoff*) fmt=ecoff ;;
+       alpha*-*-linux-gnu*)  fmt=elf em=linux ;;
+       alpha*-*-netbsd*)     fmt=elf em=nbsd ;;
+-      alpha*-*-openbsd*)    fmt=elf em=obsd ;;
++      alpha*-*-openbsd*)    fmt=elf em=nbsd ;;
+ 
+       arc-*-elf*)           fmt=elf bfd_gas=yes ;;
+ 
+@@ -221,8 +221,7 @@ changequote([,])dnl
+ 			    esac ;;
+       hppa-*-*elf*)         fmt=elf em=hppa ;;
+       hppa-*-lites*)        fmt=elf em=hppa ;;
+-      hppa-*-netbsd*)       fmt=elf em=nbsd ;;
+-      hppa-*-openbsd*)      fmt=elf em=hppa ;;
++      hppa-*-netbsd* | hppa-*-openbsd*) fmt=elf em=nbsd ;;
+       hppa-*-osf*)          fmt=som em=hppa ;;
+       hppa-*-rtems*)        fmt=elf em=hppa ;;
+       hppa-*-hpux11*)	    case ${cpu} in
+@@ -260,7 +259,14 @@ changequote([,])dnl
  					;;
  			    esac
  			    ;;
@@ -17,7 +36,7 @@ $OpenBSD: patch-gas_configure_in,v 1.6 2003/06/07 23:35:49 brad Exp $
        i386-*-linux*aout* | i386-*-linux*oldld)   fmt=aout em=linux ;;
        i386-*-linux*coff*)   fmt=coff em=linux ;;
        i386-*-linux-gnu*)    fmt=elf em=linux bfd_gas=yes ;;
-@@ -458,12 +465,15 @@ changequote([,])dnl
+@@ -458,12 +464,15 @@ changequote([,])dnl
                                  sparc64) fmt=elf ;;
                              esac
                              ;;