diff --git a/build/jam/packages/HaikuLoader b/build/jam/packages/HaikuLoader
index 5f048b0a80..4a35c9a59b 100644
--- a/build/jam/packages/HaikuLoader
+++ b/build/jam/packages/HaikuLoader
@@ -1,10 +1,13 @@
 local haikuLoaderPackage = haiku_loader.hpkg ;
 HaikuPackage $(haikuLoaderPackage) ;
 
-
-# boot loader
-AddFilesToPackage : haiku_loader.$(HAIKU_KERNEL_PLATFORM) ;
-
+# Add compiled boot loaders for architecture
+# NOTE: bios_ia32 *MUST* be first on x86 in the hpkg for the MBR loader.
+# It currently is based on name (b before e)
+local bootTarget ;
+for bootTarget in $(HAIKU_BOOT_TARGETS) {
+	AddFilesToPackage : haiku_loader.$(bootTarget) ;
+}
 
 # Force no compression, so the stage one loader can directly execute the boot
 # loader.