Index: arch/amd64/Makefile.inc
===================================================================
--- arch/amd64/Makefile.inc	(revision 2f2708d49f4b93f19b8892a6c78effabb7a78c88)
+++ arch/amd64/Makefile.inc	(revision e0dd1a88b3401d76633f38b3c330057e8ba7fcf3)
@@ -27,19 +27,22 @@
 #
 
-build: image.boot
+build: image.iso
 
-image.boot: kernel uspace
-	gunzip -c arch/$(ARCH)/grub/grub.img.gz > image.boot
-	e2cp arch/$(ARCH)/grub/grub.conf image.boot:/boot/grub/grub.conf
-	e2cp $(KERNELDIR)/kernel.bin image.boot:/boot/kernel.bin
-	e2cp $(USPACEDIR)/init/init image.boot:/init
-	e2cp $(USPACEDIR)/ns/ns image.boot:/ns
-	e2cp $(USPACEDIR)/pci/pci image.boot:/pci
-	e2cp $(USPACEDIR)/fb/fb image.boot:/fb
-	e2cp $(USPACEDIR)/kbd/kbd image.boot:/kbd
-	e2cp $(USPACEDIR)/console/console image.boot:/console
+image.iso: kernel uspace
+	mkdir -p arch/$(ARCH)/iso/boot/grub
+	cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/
+	cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/
+	cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
+	cp $(USPACEDIR)/init/init arch/$(ARCH)/iso/boot/
+	cp $(USPACEDIR)/ns/ns arch/$(ARCH)/iso/boot/
+	cp $(USPACEDIR)/pci/pci arch/$(ARCH)/iso/boot/
+	cp $(USPACEDIR)/fb/fb arch/$(ARCH)/iso/boot/
+	cp $(USPACEDIR)/kbd/kbd arch/$(ARCH)/iso/boot/
+	cp $(USPACEDIR)/console/console arch/$(ARCH)/iso/boot/
+	mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o image.iso arch/$(ARCH)/iso/
 
 clean: clean_kernel clean_uspace
-	-rm -f image.boot
+	-rm -fr arch/$(ARCH)/iso
+	-rm -f image.iso
 
 arch_distclean: distclean_kernel distclean_uspace
Index: ch/amd64/grub/grub.conf
===================================================================
--- arch/amd64/grub/grub.conf	(revision 2f2708d49f4b93f19b8892a6c78effabb7a78c88)
+++ 	(revision )
@@ -1,16 +1,0 @@
-default 0
-timeout 10
-
-title=HelenOS
-root (fd0)
-kernel /boot/kernel.bin
-
-title=HelenOS (w/ uspace)
-root (fd0)
-kernel /boot/kernel.bin
-module /ns
-module /init
-module /pci
-module /fb
-module /kbd
-module /console
Index: arch/amd64/grub/menu.lst
===================================================================
--- arch/amd64/grub/menu.lst	(revision e0dd1a88b3401d76633f38b3c330057e8ba7fcf3)
+++ arch/amd64/grub/menu.lst	(revision e0dd1a88b3401d76633f38b3c330057e8ba7fcf3)
@@ -0,0 +1,12 @@
+default 0
+timeout 10
+
+title=HelenOS
+root (cd)
+kernel /boot/kernel.bin
+module /boot/ns
+module /boot/init
+module /boot/pci
+module /boot/fb
+module /boot/kbd
+module /boot/console