diff --git a/srcpkgs/initramfs-tools/files/hooks/busybox b/srcpkgs/initramfs-tools/files/hooks/busybox
index 5b2a3f58ac2..b400e43fb05 100755
--- a/srcpkgs/initramfs-tools/files/hooks/busybox
+++ b/srcpkgs/initramfs-tools/files/hooks/busybox
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-BUSYBOXDIR="/usr/lib/busybox-initramfs/bin"
 PREREQ=""
 
 prereqs()
@@ -17,6 +16,6 @@ prereqs)
 esac
 
 . /usr/share/initramfs-tools/hook-functions
-copy_exec ${BUSYBOXDIR}/busybox /bin/busybox
+copy_exec /bin/busybox
 
 exit 0
diff --git a/srcpkgs/initramfs-tools/files/init b/srcpkgs/initramfs-tools/files/init
index 229bf1041e7..9249eef9e78 100755
--- a/srcpkgs/initramfs-tools/files/init
+++ b/srcpkgs/initramfs-tools/files/init
@@ -2,18 +2,8 @@
 
 echo "Starting up the initramfs, please wait..."
 
-BUSYBOX_LINKS="
-[ [[ ash awk basename cat chgrp chmod chown chroot clear cmp comm cp \
-cut date dd deallocvt df dirname dmesg dnsdomainname du echo \
-egrep env expand expr false fgrep find fsync fuser grep head hexdump hostname \
-id install kbd_mode kill killall killall5 ln loadfont losetup ls lsmod \
-mkdir mkfifo mknod mktemp more mount mv pgrep pidof pivot_root pkill \
-printenv printf ps pwd readlink realpath rm rmdir sed seq sh sleep sort \
-split stat stty sum switch_root sync tac tail tee test top touch tr true tty \
-umount uname uniq vi wc xargs yes"
-
 # Create required busybox symlinks
-for f in $BUSYBOX_LINKS; do
+for f in $(/bin/busybox --list); do
 	/bin/busybox ln -s /bin/busybox /bin/${f}
 done
 
diff --git a/srcpkgs/initramfs-tools/template b/srcpkgs/initramfs-tools/template
index e5c8b29ad7c..8021c1ca4ec 100644
--- a/srcpkgs/initramfs-tools/template
+++ b/srcpkgs/initramfs-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'initramfs-tools'
 pkgname=initramfs-tools
-_localver=0.99.7.2	# This is the XBPS version
+_localver=0.99.8.0	# This is the XBPS version
 _distver=0.98.5		# This should match debian version
 version=${_localver}.${_distver}
 build_style=custom-install
@@ -34,7 +34,7 @@ Add_dependency full bzip2
 Add_dependency full xz
 Add_dependency full udev
 Add_dependency full module-init-tools
-Add_dependency full busybox-initramfs
+Add_dependency full busybox
 Add_dependency full klibc-resume
 
 do_install()