diff --git a/src/freedombone-image b/src/freedombone-image
index 5564ccaa8b0df08b3bea2e0bac58c39c500c1d3e..b263cecd3de3d34752fb09ac8c266a3e36589bd2 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -164,16 +164,22 @@ function image_setup {
 
     case $setup_type in
         debian|ubuntu|trisquel|mint)
+            # NOTE: These packages aren't available on ARM
             # shellcheck disable=SC2086
-            sudo $REMOVE_PACKAGES vmdebootstrap
-            # shellcheck disable=SC2086
-            sudo $INSTALL_PACKAGES build-essential gcc-multilib g++-multilib libc6-dev
+            sudo $INSTALL_PACKAGES gcc-multilib g++-multilib
             # shellcheck disable=SC2086
             sudo $INSTALL_PACKAGES libc6-dev-i386
             # shellcheck disable=SC2086
+            sudo $INSTALL_PACKAGES extlinux
+
+            # shellcheck disable=SC2086
+            sudo $REMOVE_PACKAGES vmdebootstrap
+            # shellcheck disable=SC2086
+            sudo $INSTALL_PACKAGES build-essential libc6-dev
+            # shellcheck disable=SC2086
             sudo $INSTALL_PACKAGES git python-docutils mktorrent xz-utils debootstrap
             # shellcheck disable=SC2086
-            sudo $INSTALL_PACKAGES dosfstools btrfs-tools extlinux python-distro-info mbr
+            sudo $INSTALL_PACKAGES dosfstools btrfs-tools python-distro-info mbr
             # shellcheck disable=SC2086
             sudo $INSTALL_PACKAGES qemu-user-static binfmt-support u-boot-tools qemu
             # shellcheck disable=SC2086