Index: arch/sparc64/Makefile.inc
===================================================================
--- arch/sparc64/Makefile.inc	(revision 1b7dc656c64223b7b57e2c7ca34e8c635164a490)
+++ arch/sparc64/Makefile.inc	(revision fec35544f72ae20ecc285146461af27bb0fa771a)
@@ -34,11 +34,12 @@
 	make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(CONFIG_IMAGE)
 	mkdir -p $(TMP)/boot
-	mkdir -p $(TMP)/kernel
+	mkdir -p $(TMP)/HelenOS
 	cat arch/$(ARCH)/silo/silo.tar.gz | (cd $(TMP)/boot; tar xvfz -)
 	cp arch/$(ARCH)/silo/README arch/$(ARCH)/silo/COPYING arch/$(ARCH)/silo/silo.conf $(TMP)/boot
-	ln -sf ../../$(KERNELDIR)/kernel.bin $(TMP)/kernel/kernel.bin
+	cp arch/$(ARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
 	mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o image.iso $(TMP)/
 
-clean: clean_kernel
+clean: clean_boot_gen clean_kernel
+	 make -C arch/$(ARCH)/loader clean
 	-rm -fr $(TMP)
 	-rm -f image.iso
Index: arch/sparc64/loader/asm.S
===================================================================
--- arch/sparc64/loader/asm.S	(revision 1b7dc656c64223b7b57e2c7ca34e8c635164a490)
+++ arch/sparc64/loader/asm.S	(revision fec35544f72ae20ecc285146461af27bb0fa771a)
@@ -95,4 +95,5 @@
 
 jump_to_kernel:
-	b jump_to_kernel
-	nop
+	set ofw, %l0
+	jmp %o0				! jump to kernel
+	ldx [%l0], %o4			! pass OpenFirmware address in %o4
Index: arch/sparc64/silo/silo.conf
===================================================================
--- arch/sparc64/silo/silo.conf	(revision 1b7dc656c64223b7b57e2c7ca34e8c635164a490)
+++ arch/sparc64/silo/silo.conf	(revision fec35544f72ae20ecc285146461af27bb0fa771a)
@@ -1,3 +1,3 @@
 timeout = 0
-image = /kernel/kernel.bin
-	label = spartan
+image = /HelenOS/image.boot
+	label = HelenOS