diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 771438db97..ae2fdf81b2 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -693,20 +693,18 @@ if [ IsPackageAvailable expat_devel ] {
 
 
 # gnu-efi
-if $(TARGET_PACKAGING_ARCH) = x86_64 {
-	if [ IsPackageAvailable gnu_efi_kernel ] {
-		ExtractBuildFeatureArchives gnuefi :
-			file: base gnu_efi_kernel
-				headers: develop/headers/gnuefi
-				headersProtocol: develop/headers/gnuefi/protocol
-				headersArch: develop/headers/gnuefi/$(TARGET_ARCH)
-				libdir: develop/lib/gnuefi
-			;
+if [ IsPackageAvailable gnu_efi_kernel ] {
+	ExtractBuildFeatureArchives gnuefi :
+		file: base gnu_efi_kernel
+			headers: develop/headers/gnuefi
+			headersProtocol: develop/headers/gnuefi/protocol
+			headersArch: develop/headers/gnuefi/$(TARGET_ARCH)
+			libdir: develop/lib/gnuefi
+		;
 
-		EnableBuildFeatures gnuefi ;
-	} else {
-		Echo "gnu_efi_kernel support not available on $(TARGET_PACKAGING_ARCH)" ;
-	}
+	EnableBuildFeatures gnuefi ;
+} else {
+	Echo "gnu_efi_kernel support not available on $(TARGET_PACKAGING_ARCH)" ;
 }
 
 
diff --git a/src/system/boot/platform/efi/Jamfile b/src/system/boot/platform/efi/Jamfile
index f6ac32cb65..16f6a6d2dd 100644
--- a/src/system/boot/platform/efi/Jamfile
+++ b/src/system/boot/platform/efi/Jamfile
@@ -16,7 +16,7 @@ SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems gpt ;
 }
 
 local efi_glue_src =
-	crt0-efi-x86_64.S
+	crt0-efi-$(TARGET_ARCH).S
 	;
 
 local platform_src =