--- /usr/portage/sys-devel/dev86/dev86-0.16.18.ebuild	2010-12-07 08:40:05.000000000 +0100
+++ dev86-0.16.18.ebuild	2011-02-10 14:23:17.435939000 +0100
@@ -30,6 +30,8 @@
 	cd "${S}"
 	epatch "${FILESDIR}"/dev86-pic.patch
 	epatch "${FILESDIR}"/${PN}-0.16.17-fortify.patch
+	epatch "${FILESDIR}"/dev86-0.16.18-memmove.patch # bug 354351
+	epatch  "${FILESDIR}"/dev86-0.16.18-remove-bin86-conflicts.patch
 	sed -i \
 		-e "s:-O2 -g:${CFLAGS}:" \
 		-e '/INEXE=/s:-s::' \
@@ -59,7 +61,7 @@
 	dobin bootblocks/makeboot || die
 	# remove all the stuff supplied by bin86
 	cd "${D}"
-	rm usr/bin/{as,ld,nm,objdump,size}86 || die
+	# rm usr/bin/{as,ld,nm,objdump,size}86 || die
 	rm usr/man/man1/{as,ld}86.1 || die
 	dodir /usr/share/man
 	mv usr/man usr/share/ || die