diff --git a/src/kits/bluetooth/Jamfile b/src/kits/bluetooth/Jamfile
index 2bc4091d6f2..da3a1d1fc24 100644
--- a/src/kits/bluetooth/Jamfile
+++ b/src/kits/bluetooth/Jamfile
@@ -10,22 +10,28 @@ UsePrivateHeaders shared bluetooth ;
 
 SubDirHdrs [ FDirName $(SUBDIR) UI ] ;
 
-SEARCH_SOURCE += [ FDirName $(SUBDIR) UI ] ;
-
-
-SharedLibrary libbluetooth.so :
-	LocalDevice.cpp
-	DiscoveryListener.cpp
-	DiscoveryAgent.cpp
-	RemoteDevice.cpp
-	CommandManager.cpp
-	KitSupport.cpp
-	DeviceClass.cpp
-	#UI
-	PincodeWindow.cpp
-	ConnectionIncoming.cpp
-	: be localestub [ TargetLibstdc++ ]
-;
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+
+		SEARCH_SOURCE += [ FDirName $(SUBDIR) UI ] ;
+
+		SharedLibrary [ MultiArchDefaultGristFiles libbluetooth.so ] :
+			LocalDevice.cpp
+			DiscoveryListener.cpp
+			DiscoveryAgent.cpp
+			RemoteDevice.cpp
+			CommandManager.cpp
+			KitSupport.cpp
+			DeviceClass.cpp
+			#UI
+			PincodeWindow.cpp
+			ConnectionIncoming.cpp
+			:
+			be localestub [ TargetLibstdc++ ]
+		;
+	}
+}
 
 DoCatalogs libbluetooth.so :
 	x-vnd.Haiku-Bluetooth