diff --git a/build/jam/packages/HaikuSecondaryBootstrap b/build/jam/packages/HaikuSecondaryBootstrap
index e911e1a2c6..c51afc376a 100644
--- a/build/jam/packages/HaikuSecondaryBootstrap
+++ b/build/jam/packages/HaikuSecondaryBootstrap
@@ -4,6 +4,7 @@ local architecture = $(TARGET_PACKAGING_ARCH) ;
 local haikuPackage = haiku_$(architecture).hpkg ;
 HaikuPackage $(haikuPackage) ;
 
+AddFilesToPackage $(architecture) : <$(architecture)>runtime_loader ;
 
 # libs
 AddLibrariesToPackage lib $(architecture)
diff --git a/src/system/runtime_loader/Jamfile b/src/system/runtime_loader/Jamfile
index 71a80b2215..5476f5da01 100644
--- a/src/system/runtime_loader/Jamfile
+++ b/src/system/runtime_loader/Jamfile
@@ -96,7 +96,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			utility.cpp
 		;
 
-		Objects $(sources) ;
+		Objects [ FGristFiles $(sources) ] ;
 
 		Ld [ MultiArchDefaultGristFiles runtime_loader ] :
 			[ FGristFiles $(sources:S=$(SUFOBJ)) ]