Index: boot/Makefile.grub
===================================================================
--- boot/Makefile.grub	(revision 1c24c7cb24fc96fae0899ef64c61fe364ea323eb)
+++ boot/Makefile.grub	(revision b6bbc74b63bc4fbd88824dc1c87c59ea24fcff28)
@@ -55,5 +55,5 @@
 endif
 ifeq ($(GRUB_ARCH),efi)
-	$(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS boot ISO" -efi-boot $(ELTORITO) -o $@ $(DISTROOT)/
+	$(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS boot ISO" --efi-boot $(ELTORITO) -o $@ $(DISTROOT)/
 endif
 
Index: tools/autotool.py
===================================================================
--- tools/autotool.py	(revision 1c24c7cb24fc96fae0899ef64c61fe364ea323eb)
+++ tools/autotool.py	(revision b6bbc74b63bc4fbd88824dc1c87c59ea24fcff28)
@@ -924,5 +924,7 @@
 		# Platform-specific utilities
 		if ((config['BARCH'] == "amd64") or (config['BARCH'] == "ia32") or (config['BARCH'] == "ppc32") or (config['BARCH'] == "sparc64")):
-			common['GENISOIMAGE'] = check_app_alternatives(["mkisofs", "genisoimage"], ["--version"], "ISO 9660 creation utility", "usually part of genisoimage")
+			common['GENISOIMAGE'] = check_app_alternatives(["xorriso", "mkisofs", "genisoimage"], ["--version"], "ISO 9660 creation utility", "usually part of genisoimage")
+			if common['GENISOIMAGE'] == 'xorriso':
+			    common['GENISOIMAGE'] += ' -as genisoimage'
 		
 		probe = probe_compiler(common,