diff --git a/autorun/.gitkeep b/autorun/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/build.sh b/build.sh
index ad70715..0ebb538 100755
--- a/build.sh
+++ b/build.sh
@@ -347,8 +347,13 @@ make_prepare() {
 
 # Build ISO
 make_iso() {
+    # Copy version file
     cp ${version_file} ${work_dir}/iso/${install_dir}/
+    # Copy autorun folder
+    test -d autorun && cp -r autorun ${work_dir}/iso/
+    # Copy configuration files
     cp -r sysrescue.d/ ${work_dir}/iso/
+    # Copy SRM modules
     (
         shopt -s nullglob
         rm -vf ${work_dir}/iso/${install_dir}/*.srm
@@ -356,6 +361,7 @@ make_iso() {
             cp -vf "$srm" ${work_dir}/iso/${install_dir}/
         done
     )
+    # Create the ISO image
     setarch ${arch} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${arch/x86_64/amd64}.iso"
 }
 
diff --git a/patches/archiso-v43-06-copytoram.patch b/patches/archiso-v43-06-copytoram.patch
index 2bdc092..5720520 100644
--- a/patches/archiso-v43-06-copytoram.patch
+++ b/patches/archiso-v43-06-copytoram.patch
@@ -8,7 +8,7 @@ diff -urN archiso-43-a/archiso/initcpio/hooks/archiso archiso-43-b/archiso/initc
 +    if [[ "${copytoram}" == "y" ]]; then
 +        if ls -lh /run/archiso/bootmnt/autorun* >/dev/null 2>/dev/null; then
 +            msg ":: Copying autorun scripts to RAM ..."
-+            if ! cp /run/archiso/bootmnt/autorun* /run/archiso/copytoram/ ; then
++            if ! cp -r /run/archiso/bootmnt/autorun* /run/archiso/copytoram/ ; then
 +                echo "ERROR: failed to copy '/run/archiso/bootmnt/autorun*' to '/run/archiso/copytoram/'"
 +                launch_interactive_shell
 +            fi