diff --git a/bin/mkiso.in b/bin/mkiso.in
index 897b257..137f58d 100755
--- a/bin/mkiso.in
+++ b/bin/mkiso.in
@@ -123,7 +123,7 @@ clean_up(){
     msg2 "Cleaning up what we can"
     if [ -d "${work_dir}/${IMAGE_FOLDER}/boot/" ]; then
 	# remove the initcpio images that were generated for the host system
-	find "${work_dir}/${IMAGE_FOLDER}/boot" -name '*.img' -delete
+	find "${work_dir}/${IMAGE_FOLDER}/boot" -name 'initramfs*.img' -delete
     fi
 
     if ${CREATE_DEFAULT}; then
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 25b02bb..c4f3625 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -708,7 +708,10 @@ make_boot() {
         gen_boot_img
         
         mv ${work_dir}/boot-image/boot/${img_name}.img ${work_dir}/iso/${install_dir}/boot/${arch}/${img_name}.img
-                
+         
+	cp ${work_dir}/boot-image/boot/intel-ucode.img ${work_dir}/iso/${install_dir}/boot/intel_ucode.img
+	cp ${work_dir}/boot-image/usr/share/licenses/intel-ucode/LICENSE ${work_dir}/iso/${install_dir}/boot/intel_ucode.LICENSE
+
         umount ${work_dir}/boot-image
         
         rm -R ${work_dir}/boot-image
@@ -764,6 +767,7 @@ make_efiboot() {
         mkdir -p ${work_dir}/efiboot/EFI/miso
         cp ${work_dir}/iso/${install_dir}/boot/x86_64/${manjaroiso} ${work_dir}/efiboot/EFI/miso/${manjaroiso}.efi
         cp ${work_dir}/iso/${install_dir}/boot/x86_64/${img_name}.img ${work_dir}/efiboot/EFI/miso/${img_name}.img
+        cp ${work_dir}/iso/${install_dir}/boot/intel_ucode.img ${work_dir}/efiboot/EFI/miso/intel_ucode.img
 
         mkdir -p ${work_dir}/efiboot/EFI/boot
         cp ${work_dir}/root-image/usr/lib/prebootloader/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi