--- busybox-1.12.2.ebuild	2008-11-20 10:29:38.000000000 +0900
+++ busybox-1.12.2-r1.ebuild	2008-11-21 01:14:47.000000000 +0900
@@ -101,11 +101,10 @@
 		Makefile.flags || die
 	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
 	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	cat <<-EOF >> Makefile.flags
-	CROSS_COMPILE := ${CHOST}-
-	HOSTCC := $(tc-getBUILD_CC)
-	SKIP_STRIP = y
-	EOF
+	sed -i \
+		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		Makefile || die
 
 	# check for a busybox config before making one of our own.
 	# if one exist lets return and use it.
@@ -165,7 +164,10 @@
 	emake busybox || die "build failed"
 	if ! use static && ! use pam ; then
 		mv busybox_unstripped{,.bak}
-		emake CONFIG_STATIC=y busybox || die "static build failed"
+		emake \
+			CONFIG_STATIC=y \
+			SKIP_STRIP=y \
+			busybox || die "static build failed"
 		mv busybox_unstripped bb
 		mv busybox_unstripped{.bak,}
 	fi