diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index e611accbc0cbda40a56010af3fdd0a94e28a194c..9623f80019d4c8d177883f2f207101c66fbe1637 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -164,12 +164,14 @@ arm_setup_boot() {
     arm_boot_console='ttyO0,115200n8'
     arm_arch=arm
     arm_uenv=
+    arm_repack=
 
     case "$dtb" in
         "am"*) arm_loadaddr='0x82000000'
                arm_initrd_addr='0x88080000'
                arm_fdtaddr='0x88000000'
                arm_uenv=1
+               arm_repack=1
                if [ "$EXTERNAL_DRIVE" ]; then
                    arm_boot_device="usb 0:1"
                    arm_loadaddr='0x80300000'
@@ -178,7 +180,8 @@ arm_setup_boot() {
                    arm_boot_start='usb start; '
                fi
                ;;
-        "sun"*) arm_boot_device="mmc 0:1"
+        "sun"*) $INSTALL_PACKAGES_BACKPORTS linux-image-armmp-lpae
+                arm_boot_device="mmc 0:1"
                 { echo "rtc_sunxi";
                   echo "vfat"; } >> /etc/initramfs-tools/modules
                 ;;
@@ -222,9 +225,6 @@ uenvcmd=${arm_boot_start}run loadfiles; run mmcargs; bootz \${loadaddr} \${initr
 EOF
         # Copy all DTBs
         cp /usr/lib/linux-image-*-armmp/* /boot/dtbs
-
-        arm_flash "$arm_flash_name"
-        arm_repack_kernel "${dtb}" "$arm_loadaddr" "$arm_initrd_addr" "$arm_arch"
     else
         cat >> /boot/boot.cmd <<EOF
 scsi scan
@@ -241,6 +241,11 @@ EOF
         cp /usr/lib/$kernelVersion/* /boot/dtbs
     fi
 
+    if [ $arm_repack ]; then
+        arm_flash "$arm_flash_name"
+        arm_repack_kernel "${dtb}" "$arm_loadaddr" "$arm_initrd_addr" "$arm_arch"
+    fi
+
     enable_serial_console ttyS0
 }