diff --git a/Makefile b/Makefile
index b0b1dadc..af34f800 100755
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ ifndef TASK
 TASK=Debian-generic
 endif
 ifndef MKISOFS
-ifneq (,$(filter i386 amd64 amd64,$(ARCHES)))
+ifneq (,$(filter i386 amd64 arm64,$(ARCHES)))
 export MKISOFS=xorriso
 export MKISOFS_OPTS=-as mkisofs -r -checksum_algorithm_iso md5,sha1
 else
diff --git a/tools/boot/jessie/boot-arm64 b/tools/boot/jessie/boot-arm64
index d3cbc4e4..ab1f820b 100755
--- a/tools/boot/jessie/boot-arm64
+++ b/tools/boot/jessie/boot-arm64
@@ -2,7 +2,7 @@
 
 # Based on boot-x86
 #
-# Do install stuff for xarm64, including making bootable CDs
+# Do install stuff for arm64, including making bootable CDs
 # Works with debian-installer
 #
 # $1 is the CD number