diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index efe95e5a1a..4305327159 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -933,6 +933,7 @@ rule AddBootModuleSymlinksToHaikuImage targets
 
 rule AddPackageFilesToHaikuImage location : packages
 {
+	packages = [ FFilterByBuildFeatures $(packages) ] ;
 	HAIKU_PACKAGES_IN_IMAGE on $(HAIKU_IMAGE_CONTAINER_NAME)
 		= [ on $(HAIKU_IMAGE_CONTAINER_NAME) return $(HAIKU_PACKAGES_IN_IMAGE) ]
 			$(packages) ;
@@ -997,6 +998,8 @@ rule AddHaikuImagePackages packages : installationLocation
 
 	installationLocation ?= common ;
 
+	packages = [ FFilterByBuildFeatures $(packages) ] ;
+
 	local package ;
 	for package in $(packages) {
 		local resolvedPackage = [ IsPackageAvailable $(package) ] ;