diff --git a/srcpkgs/busybox-initramfs/template b/srcpkgs/busybox-initramfs/template
index 5e251f0b224..cc97af618bb 100644
--- a/srcpkgs/busybox-initramfs/template
+++ b/srcpkgs/busybox-initramfs/template
@@ -1,7 +1,7 @@
 # Build template for 'busybox-initramfs'.
 pkgname=busybox-initramfs
 version=1.16.1
-revision=1
+revision=2
 wrksrc=busybox-$version
 distfiles="http://www.busybox.net/downloads/busybox-$version.tar.bz2"
 build_style=gnu_makefile
@@ -21,27 +21,13 @@ long_desc="
 
  This package provides some required utilities for the initial ramdisks."
 
+# Workaround for broken binary with gcc 4.5, solution here:
+# http://gcc.gnu.org/ml/gcc-bugs/2010-05/msg00432.html
+CFLAGS="-fno-tree-pta"
 base_chroot=yes
 Add_dependency run glibc
 
 pre_build()
 {
-	# It seems that gcc-4.5 generates a bad busybox binary,
-	# notably sed(1) segfaults on every command. Download a
-	# binary from busybox.net.
-	if [ "${xbps_machine}" = "x86_64" ]; then
-		${XBPS_FETCH_CMD} \
-			http://www.busybox.net/downloads/binaries/${version}/busybox-x86_64
-	fi
 	cp -f ${FILESDIR}/dotconfig ${wrksrc}/.config
 }
-
-post_install()
-{
-	if [ "${xbps_machine}" = "x86_64" ]; then
-		mv ${wrksrc}/busybox-x86_64 \
-			${DESTDIR}/usr/lib/busybox-initramfs/bin/busybox
-		chmod 755 ${DESTDIR}/usr/lib/busybox-initramfs/bin/busybox
-	fi
-	:
-}