diff --git a/build/jam/HaikuPackages b/build/jam/HaikuPackages
index 4b040d83f3..85c798cc2c 100644
--- a/build/jam/HaikuPackages
+++ b/build/jam/HaikuPackages
@@ -7,7 +7,7 @@ local packages = [ FFilterByBuildFeatures
 	HaikuWelcome
 	MakefileEngine
 	NetFS@!x86_64
-	UserlandFS
+	UserlandFS@!x86_64
 	]
 	;
 
diff --git a/build/jam/repositories/Haiku b/build/jam/repositories/Haiku
index aedc72da59..8dee041770 100644
--- a/build/jam/repositories/Haiku
+++ b/build/jam/repositories/Haiku
@@ -8,19 +8,19 @@ local repoInfo = <repository-info-template>haiku ;
 SEARCH on $(repoInfo) = $(HAIKU_TOP)/src/data/repository_infos ;
 
 local secondaryArchs = $(TARGET_PACKAGING_ARCHS[2-]) ;
-local packages =
+local packages = [ FFilterByBuildFeatures
 	haiku
 	haiku_devel
 	haiku_loader
 	haiku_userguide
 	haiku_welcome
 	makefile_engine
-	netfs
-	userland_fs
+	netfs@!x86_64
+	userland_fs@!x86_64
 
 	haiku_$(secondaryArchs)
 	haiku_$(secondaryArchs)_devel
-	;
+	] ;
 
 local webPositiveIsAvailable ;
 local architectureObject ;