diff --git a/usr/lib/initcpio/install/archboot_installer b/usr/lib/initcpio/install/archboot_installer
index 3085d42ae..eff86c5bc 100644
--- a/usr/lib/initcpio/install/archboot_installer
+++ b/usr/lib/initcpio/install/archboot_installer
@@ -3,24 +3,16 @@
 
 build ()
 {
+    apps="genfstab arch-chroot pacstrap archboot-$(uname -m)-create-container.sh \
+          archboot-$(uname -m)-release.sh archboot-mktorrent.sh \
+          archboot-restore-usbstick.sh isoinfo mktorrent archboot-copy-mountpoint.sh \
+          archboot-rsync-backup.sh archboot-binary-check.sh"
+    for i in $apps; do
+        add_binary "$i"
+    done
     add_file "/usr/bin/archboot-setup.sh" "/usr/bin/setup"
     add_file "/usr/bin/archboot-quickinst.sh" "/usr/bin/quickinst"
-    add_file "/usr/bin/genfstab"
-    add_file "/usr/bin/arch-chroot"
-    add_file "/usr/bin/pacstrap"
     add_file "/usr/bin/archboot-update-installer.sh" "/usr/bin/update-installer.sh"
-    add_file "/usr/bin/archboot-$(uname -m)-create-container.sh"
-    add_file "/usr/bin/archboot-$(uname -m)-release.sh"
-    add_file "/usr/bin/archboot-mktorrent.sh"
-    add_file "/usr/bin/archboot-restore-usbstick.sh"
-    add_binary "/usr/bin/isoinfo" 
-    add_binary "/usr/bin/mktorrent"
-    ### add copy-mountpoint.sh
-    add_file "/usr/bin/archboot-copy-mountpoint.sh"
-    ### add rsync-backup.sh
-    add_file "/usr/bin/archboot-rsync-backup.sh"
-    ### add binary add_check
-    add_file "/usr/bin/archboot-binary-check.sh"
     # only include cachedir on booted archboot or container
     if [[ -e "/etc/hostname" ]]; then
         [[ "$(cat /etc/hostname)" == "archboot" ]] && add_full_dir "/var/cache/pacman/pkg"