Index: head/base/binutils/Makefile
===================================================================
--- head/base/binutils/Makefile
+++ head/base/binutils/Makefile
@@ -23,11 +23,27 @@
 
 CONFIGURE_ARGS+=	--disable-host-shared
 PREFIX=	/usr
+BUREMOVE=	addr2line \
+		ar \
+		c++filt \
+		dlltool \
+		elfedit \
+		gprof \
+		nlmconv \
+		nm \
+		ranlib \
+		readelf \
+		size \
+		strings \
+		strip \
+		windmc \
+		windres
 
 .include "${MASTERDIR}/Makefile"
 
 .if ${OSVERSION} >= 1100100
 PLIST_SUB+=	OBJCOPY="@comment "
+BUREMOVE+=	objcopy
 .else
 PLIST_SUB+=	OBJCOPY=""
 .endif
Index: head/base/binutils/pkg-plist
===================================================================
--- head/base/binutils/pkg-plist
+++ head/base/binutils/pkg-plist
@@ -8,6 +8,11 @@
 bin/%%BUTARGET%%-ld.bfd
 %%OBJCOPY%%bin/%%BUTARGET%%-objcopy
 bin/%%BUTARGET%%-objdump
+%%BUTARGET%%/bin/as
+%%BUTARGET%%/bin/ld
+%%BUTARGET%%/bin/ld.bfd
+%%OBJCOPY%%%%BUTARGET%%/bin/objcopy
+%%BUTARGET%%/bin/objdump
 %%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.x
 %%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xbn
 %%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xc
Index: head/devel/binutils/Makefile
===================================================================
--- head/devel/binutils/Makefile
+++ head/devel/binutils/Makefile
@@ -145,11 +145,15 @@
 	${MV} ${STAGEDIR}/${MANDIR}1/objdump.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objdump.1
 	${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objdump.1
 	${LN} -fs ${BUTARGET}-objdump.1.gz ${STAGEDIR}/${MANDIR}1/objdump.1.gz
+	@${RM} -r ${STAGEDIR}${PREFIX}/include
+	@${RM} -r ${STAGEDIR}${PREFIX}/lib
 .endif
 .endif
 .for tool in ${BUREMOVE}
 	@${RM} ${STAGEDIR}${PREFIX}/bin/${BUTARGET}-${tool} \
-	    ${STAGEDIR}${PREFIX}/man/man1/${BUTARGET}-${tool}.1 \
+	    ${STAGEDIR}${PREFIX}/bin/${tool} \
+	    ${STAGEDIR}${MANPREFIX}/man/man1/${BUTARGET}-${tool}.1 \
+	    ${STAGEDIR}${MANPREFIX}/man/man1/${tool}.1 \
 	    ${STAGEDIR}${PREFIX}/${BUTARGET}/bin/${tool}
 .endfor
 .if defined(BUREMOVE) && ${BUREMOVE:Mld}