diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index 570b9c3aed03..fe3b966d1114 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -21,6 +21,7 @@ SRCS+=	archive.c \
 	dwarf2.c \
 	elf-eh-frame.c \
 	elf-strtab.c \
+	elf-vxworks.c \
 	elf.c \
 	format.c \
 	hash.c \
@@ -81,8 +82,8 @@ CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR}
 
 # XXX:DEO should grab BFD_VERSION_DATE from ${VERSION}...
 bfdver.h: Makefile
-	echo '#define BFD_VERSION	215000000'	> ${.TARGET}
-	echo '#define BFD_VERSION_DATE	20050317'	>> ${.TARGET}
+	echo '#define BFD_VERSION	217000000'	> ${.TARGET}
+	echo '#define BFD_VERSION_DATE	20070807'	>> ${.TARGET}
 	echo '#define BFD_VERSION_STRING ${VERSION}'	>> ${.TARGET}
 
 targmatch.h: targmatch.sed config.bfd
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.arm b/gnu/usr.bin/binutils/libbfd/Makefile.arm
index 7349375694f9..9633783068fc 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.arm
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.arm
@@ -8,7 +8,7 @@ DEFAULT_VECTOR=	bfd_elf32_littlearm_vec
 
 SRCS+=	cpu-arm.c \
 	elf32.c \
-	elf32-arm-fbsd.c \
+	elf32-arm.c \
 	elf32-gen.c \
 	elf32-target.h \
 	elflink.c
@@ -19,27 +19,3 @@ VECS+=	bfd_elf32_littlearm_vec
 .else
 VECS+=	bfd_elf32_bigarm_vec
 .endif
-
-CLEANFILES+=	elf32-arm-fbsd.c
-
-# XXX: We should really add the FreeBSD case in elf32_arm_nabi_grok_prstatus
-# instead of defining our own elf32_fbsd_arm_grok_prstatus.
-#
-elf32-arm-fbsd.c: elfarm-nabi.c
-	cat ${.ALLSRC} | sed \
-	    -e s/ELFOSABI_ARM/ELFOSABI_FREEBSD/g \
-	    -e "s/\(.*#define.*\)elf32_arm_nabi_grok_prstatus/\1elf32_fbsd_arm_grok_prstatus/" \
-	    -e s/"#include.*elf32-arm.h.*//" >${.TARGET}
-	echo ' \
-	    static bfd_boolean \
-	    elf32_fbsd_arm_grok_prstatus(bfd *abfd, Elf_Internal_Note *note) \
-	    { size_t raw_size =68 ; int offset = 28; \
-	    if (note->descsz != 96) return (FALSE); \
-	    if (elf_tdata(abfd)->core_signal == 0) \
-		elf_tdata (abfd)->core_signal = ((int *)(note->descdata))[5]; \
-	    elf_tdata (abfd)->core_pid = ((int *)(note->descdata))[6]; \
-	    /* Make a ".reg/999" section.  */ \
-	    return _bfd_elfcore_make_pseudosection (abfd, ".reg",raw_size, \
-		note->descpos + offset); \
-	    }' >> ${.TARGET}
-	echo '#include "elf32-arm.h"' >> ${.TARGET}
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.sparc64 b/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
index 9a3fc03d4f2b..b3982d557c70 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
@@ -11,6 +11,8 @@ SRCS+=	aout32.c	\
 	elf64-sparc.c	\
 	elf64-target.h	\
 	elflink.c	\
+	elfxx-sparc.c	\
+	elfxx-sparc.h	\
 	sparcnetbsd.c	\
 	sunos.c