diff --git a/build/jam/repositories/Haiku b/build/jam/repositories/Haiku
index 85d8b74470..32efd457f8 100644
--- a/build/jam/repositories/Haiku
+++ b/build/jam/repositories/Haiku
@@ -20,10 +20,18 @@ local packages =
 	haiku_$(secondaryArchs)_devel
 	;
 
-if [ FIsBuildFeatureEnabled webpositive ] {
-	if $(TARGET_PACKAGING_ARCH) != x86_gcc2 || $(secondaryArchs) {
-		packages += webpositive ;
+local webPositiveIsAvailable ;
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		if [ FIsBuildFeatureEnabled webpositive ] {
+			webPositiveIsAvailable = true ;
+			break ;
+		}
 	}
 }
+if $(webPositiveIsAvailable) {
+	packages += webpositive ;
+}
 
 HaikuRepository $(haikuRepository) : $(repoInfo) : $(packages:S=.hpkg) ;