diff --git a/export-image/prerun.sh b/export-image/prerun.sh
index fc57505..0638796 100755
--- a/export-image/prerun.sh
+++ b/export-image/prerun.sh
@@ -25,7 +25,7 @@ ROOT_PART_START=$((BOOT_PART_START + BOOT_PART_SIZE))
 ROOT_PART_SIZE=$(((ROOT_SIZE + ROOT_MARGIN + ALIGN - 1) / ALIGN * ALIGN))
 RECOVERY_PART_START=$((ROOT_PART_START + ROOT_PART_SIZE))
 RECOVERY_PART_SIZE=$(((RECOVERY_SIZE + ALIGN - 1) / ALIGN * ALIGN))
-IMG_SIZE=$((RECOVERY_PART_START + RECOVERY_PART_SIZE))
+IMG_SIZE=$((BOOT_PART_START + BOOT_PART_SIZE + ROOT_PART_SIZE + RECOVERY_PART_SIZE))
 
 truncate -s "${IMG_SIZE}" "${IMG_FILE}"
 
@@ -49,8 +49,8 @@ done
 
 ensure_loopdev_partitions "$LOOP_DEV"
 BOOT_DEV="${LOOP_DEV}p1"
-RECOVERY_DEV="${LOOP_DEV}p2"
-ROOT_DEV="${LOOP_DEV}p3"
+ROOT_DEV="${LOOP_DEV}p2"
+RECOVERY_DEV="${LOOP_DEV}p3"
 
 ROOT_FEATURES="^huge_file"
 for FEATURE in 64bit; do
@@ -67,13 +67,13 @@ fi
 
 mkdosfs -n bootfs -F "$FAT_SIZE" -s 4 -v "$BOOT_DEV" > /dev/null
 mkfs.ext4 -L rootfs -O "$ROOT_FEATURES" "$ROOT_DEV" > /dev/null
-#mkfs.ext4 -L recoveryfs -O "$ROOT_FEATURES" "$RECOVERY_DEV" > /dev/null
+mkfs.ext4 -L recovery -O "$ROOT_FEATURES" "$RECOVERY_DEV" > /dev/null
 
 mount -v "$ROOT_DEV" "${ROOTFS_DIR}" -t ext4
 mkdir -p "${ROOTFS_DIR}/boot/firmware"
 mount -v "$BOOT_DEV" "${ROOTFS_DIR}/boot/firmware" -t vfat
-#mkdir -p "${ROOTFS_DIR}/recovery"
-#mount -v "$RECOVERY_DEV" "${ROOTFS_DIR}/recovery" -t ext4
+mkdir -p "${ROOTFS_DIR}/recovery"
+mount -v "$RECOVERY_DEV" "${ROOTFS_DIR}/recovery" -t ext4
 
 rsync -aHAXx --exclude /var/cache/apt/archives --exclude /boot/firmware "${EXPORT_ROOTFS_DIR}/" "${ROOTFS_DIR}/"
 rsync -rtx "${EXPORT_ROOTFS_DIR}/boot/firmware/" "${ROOTFS_DIR}/boot/firmware/"