diff --git a/src/system/boot/Jamfile b/src/system/boot/Jamfile
index 6e98fe4efe..d005d35c42 100644
--- a/src/system/boot/Jamfile
+++ b/src/system/boot/Jamfile
@@ -4,7 +4,7 @@ SetupFeatureObjectsDir $(TARGET_BOOT_PLATFORM) ;
 
 DEFINES += _BOOT_MODE ;
 
-if $(TARGET_ARCH) = x86_64 && $(TARGET_BOOT_PLATFORM) != bios_ia32 {
+if $(TARGET_ARCH) = x86_64 && $(TARGET_BOOT_PLATFORM) = efi {
 	SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) libroot os arch
 				x86_64 ] ;
 } else {
diff --git a/src/system/boot/arch/x86/Jamfile b/src/system/boot/arch/x86/Jamfile
index b1ca213e6c..4b6873580c 100644
--- a/src/system/boot/arch/x86/Jamfile
+++ b/src/system/boot/arch/x86/Jamfile
@@ -10,7 +10,7 @@ local kernelArchSources =
 
 local kernelArchSpecificSources ;
 local kernelLibArchSpecificSources ;
-if $(TARGET_ARCH) = x86_64 && $(TARGET_BOOT_PLATFORM) != bios_ia32 {
+if $(TARGET_ARCH) = x86_64 && $(TARGET_BOOT_PLATFORM) = efi {
 	kernelArchSpecificSources = cpuid.cpp ;
 	kernelLibArchSpecificSources = arch_string.cpp ;
 } else {
@@ -33,7 +33,7 @@ BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o :
 SEARCH on [ FGristFiles $(kernelArchSources) ]
     = [ FDirName $(HAIKU_TOP) src system kernel arch x86 ] ;
 
-if $(TARGET_ARCH) = x86_64 && $(TARGET_BOOT_PLATFORM) != bios_ia32 {
+if $(TARGET_ARCH) = x86_64 && $(TARGET_BOOT_PLATFORM) = efi {
 SEARCH on [ FGristFiles $(kernelArchSpecificSources) ]
     = [ FDirName $(HAIKU_TOP) src system kernel arch x86 64 ] ;
 SEARCH on [ FGristFiles $(kernelLibArchSpecificSources) ]