diff --git a/src/kits/package/solver/Jamfile b/src/kits/package/solver/Jamfile
index 4152f59e31..32e3e2812f 100644
--- a/src/kits/package/solver/Jamfile
+++ b/src/kits/package/solver/Jamfile
@@ -2,23 +2,30 @@ SubDir HAIKU_TOP src kits package solver ;
 
 # add-on implementing a libsolv based BSolver
 
-UseBuildFeatureHeaders libsolv ;
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
 
-local libsolvHeaders = [ BuildFeatureAttribute libsolv : headers : path ] ;
-UseHeaders [ FDirName $(libsolvHeaders) solv ] ;
+		UseBuildFeatureHeaders libsolv ;
 
-UsePrivateHeaders shared ;
+		local libsolvHeaders
+			= [ BuildFeatureAttribute libsolv : headers : path ] ;
+		UseHeaders [ FDirName $(libsolvHeaders) solv ] ;
+
+		UsePrivateHeaders shared ;
+
+		SharedLibrary
+			[ MultiArchDefaultGristFiles libpackage-add-on-libsolv.so ]
+			:
+			LibsolvSolver.cpp
+			:
+			package
+			[ BuildFeatureAttribute libsolv : libraries ]
+			be $(TARGET_LIBSTDC++)
+		;
 
 
-SharedLibrary libpackage-add-on-libsolv.so
-	:
-	LibsolvSolver.cpp
-	:
-	package
-	[ BuildFeatureAttribute libsolv : libraries ]
-	be $(TARGET_LIBSTDC++)
-;
-
-
-Includes [ FGristFiles LibsolvSolver.cpp ]
-	: [ BuildFeatureAttribute libsolv : headers ] ;
+		Includes [ FGristFiles LibsolvSolver.cpp ]
+			: [ BuildFeatureAttribute libsolv : headers ] ;
+	}
+}