diff --git a/build/jam/board/raspberry_pi/first32k.bin b/build/jam/board/raspberry_pi/first32k.bin
deleted file mode 100644
index ebf74be8a1..0000000000
Binary files a/build/jam/board/raspberry_pi/first32k.bin and /dev/null differ
diff --git a/src/system/boot/platform/raspberrypi_arm/entry.S b/src/system/boot/platform/raspberrypi_arm/entry.S
index 4d48aeba79..8e83693904 100644
--- a/src/system/boot/platform/raspberrypi_arm/entry.S
+++ b/src/system/boot/platform/raspberrypi_arm/entry.S
@@ -1,9 +1,24 @@
 .globl _start
 _start:
+	b boot
 
+.balign 0x20
+boot:
+	mov r0, #0
+	@ Machine ID 3138 (0xC42)
+	mov r1, #66
+	orr r1, r1, #3072
+
+	ldr pc, kern_addr
+
+kern_addr:
+	.word kern
+
+.balign 0x8000, 0
+kern:
 	/* Set up 1MB C Stack Space */
 	mov sp, #0x100000
+	mov r4, #0
 
-	mov r4,#0
-	/* Start loader */
+	/* Start Haiku loader */
 	b pi_start