diff --git a/Makefile b/Makefile
index ffcefe8..5a3797d 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,9 @@ xorriso/input.txt: xorriso/gen_input.sh
 
 xorriso/%.sh: xorriso/%.sh.in
 	sed 's/@IMAGE_NAME@/$(image_name)/' $(base_dir)/xorriso/$*.sh.in > $(base_dir)/xorriso/$*.sh
-	sed 's/@VERSION@/$(version)/'                  $(base_dir)/xorriso/$*.sh > $(base_dir)/xorriso/$*.sh.tmp
+	sed 's/@VERSION@/$(version)/'       $(base_dir)/xorriso/$*.sh > $(base_dir)/xorriso/$*.sh.tmp
+	mv $(base_dir)/xorriso/$*.sh{.tmp,}
+	sed 's/@ARCH@/$(arch)/'             $(base_dir)/xorriso/$*.sh > $(base_dir)/xorriso/$*.sh.tmp
 	mv $(base_dir)/xorriso/$*.sh{.tmp,}
 
 
diff --git a/xorriso/gen_input.sh.in b/xorriso/gen_input.sh.in
index 143d7b1..10f0499 100644
--- a/xorriso/gen_input.sh.in
+++ b/xorriso/gen_input.sh.in
@@ -3,7 +3,7 @@
 echo "-indev $(pwd)/boot.iso"
 echo "-outdev $(pwd)/@IMAGE_NAME@-@VERSION@.iso"
 echo "-boot_image any replay"
-echo "-volid Fedora-S-dvd-x86_64-39"
+echo "-volid @IMAGE_NAME@-@ARCH@-@VERSION@"
 echo "-joliet on"
 echo "-compliance joliet_long_names"
 for file in $(find @IMAGE_NAME@-@VERSION@)