Index: boot/Makefile.grub
===================================================================
--- boot/Makefile.grub	(revision a1347a7d9d2bcb49b7e781408978b65acb44ea89)
+++ boot/Makefile.grub	(revision 9cd81655f6cba65cbde69068b36eff82d99f80b8)
@@ -52,8 +52,8 @@
 $(BOOT_OUTPUT): build_dist
 ifeq ($(GRUB_ARCH),pc)
-	mkisofs -J -r -input-charset utf-8 -V "HelenOS boot ISO" -eltorito-boot $(ELTORITO) -no-emul-boot -boot-load-size 64 -boot-info-table -o $@ $(DISTROOT)/
+	$(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS boot ISO" -eltorito-boot $(ELTORITO) -no-emul-boot -boot-load-size 64 -boot-info-table -o $@ $(DISTROOT)/
 endif
 ifeq ($(GRUB_ARCH),efi)
-	mkisofs -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: boot/Makefile.silo
===================================================================
--- boot/Makefile.silo	(revision a1347a7d9d2bcb49b7e781408978b65acb44ea89)
+++ boot/Makefile.silo	(revision 9cd81655f6cba65cbde69068b36eff82d99f80b8)
@@ -41,5 +41,5 @@
 
 $(POST_OUTPUT): build_dist
-	mkisofs -f -G $(ISOFS_B_IN) -B ... -r -o $@ $(DISTROOT)/
+	$(GENISOIMAGE) -f -G $(ISOFS_B_IN) -B ... -r -o $@ $(DISTROOT)/
 
 build_dist: clean
Index: boot/Makefile.yaboot
===================================================================
--- boot/Makefile.yaboot	(revision a1347a7d9d2bcb49b7e781408978b65acb44ea89)
+++ boot/Makefile.yaboot	(revision 9cd81655f6cba65cbde69068b36eff82d99f80b8)
@@ -40,5 +40,5 @@
 
 $(POST_OUTPUT): build_dist
-	mkisofs -hfs -part -map $(MAPS) -no-desktop -hfs-volid "HelenOS" -hfs-bless $(DISTROOT)/boot -r -o $@ $(DISTROOT)/
+	$(GENISOIMAGE) -hfs -part -map $(MAPS) -no-desktop -hfs-volid "HelenOS" -hfs-bless $(DISTROOT)/boot -r -o $@ $(DISTROOT)/
 
 build_dist: clean