diff --git a/src/add-ons/kernel/bus_managers/fdt/Jamfile b/src/add-ons/kernel/bus_managers/fdt/Jamfile
index 47688d218d..857df916c2 100644
--- a/src/add-ons/kernel/bus_managers/fdt/Jamfile
+++ b/src/add-ons/kernel/bus_managers/fdt/Jamfile
@@ -23,10 +23,6 @@ KernelAddon fdt :
 	$(libFDTSources)
 	;
 
-BootStaticLibrary boot_fdt :
-	$(libFDTSources)
-	;
-
 KernelStaticLibrary kernel_fdt :
 	$(libFDTSources)
 	;
diff --git a/src/system/boot/libs/Jamfile b/src/system/boot/libs/Jamfile
index 22bfeb9fc0..8bc4796ef6 100644
--- a/src/system/boot/libs/Jamfile
+++ b/src/system/boot/libs/Jamfile
@@ -29,6 +29,17 @@ local zstdDecSources =
 	huf_decompress.c zstd_ddict.c zstd_decompress.c zstd_decompress_block.c
 	;
 
+local libFDTSourceDirectory = [ FDirName $(HAIKU_TOP) src libs libfdt ] ;
+
+local libFDTSources =
+	fdt.c
+	fdt_ro.c
+	fdt_rw.c
+	fdt_strerror.c
+	fdt_sw.c
+	fdt_wip.c
+	;
+
 local platform ;
 for platform in [ MultiBootSubDirSetup ] {
 	on $(platform) {
@@ -58,5 +69,13 @@ for platform in [ MultiBootSubDirSetup ] {
 			;
 		Depends [ FGristFiles $(zstdCommonSources) $(zstdDecSources) ]
 			: [ BuildFeatureAttribute zstd : sources ] ;
+
+		# fdt
+		UseLibraryHeaders [ FDirName libfdt ] ;
+
+		BootStaticLibrary [ MultiBootGristFiles boot_fdt ] :
+			$(libFDTSources) ;
+
+		LOCATE on [ FGristFiles $(libFDTSources) ] = $(libFDTSourceDirectory) ;
 	}
 }
diff --git a/src/system/boot/platform/efi/Jamfile b/src/system/boot/platform/efi/Jamfile
index f195556b89..d1c016aec8 100644
--- a/src/system/boot/platform/efi/Jamfile
+++ b/src/system/boot/platform/efi/Jamfile
@@ -54,7 +54,7 @@ for platform in [ MultiBootSubDirSetup efi ] {
 		BootMergeObject boot_platform_efi_common.o :
 			$(platform_src)
 			: :
-			$(support_libs)
+			[ MultiBootGristFiles $(support_libs) ]
 			boot_platform_generic_efi.a
 		;