diff --git a/src/add-ons/media/plugins/ape_reader/Jamfile b/src/add-ons/media/plugins/ape_reader/Jamfile
index 0f9c9bbc3b..a24e3b930b 100644
--- a/src/add-ons/media/plugins/ape_reader/Jamfile
+++ b/src/add-ons/media/plugins/ape_reader/Jamfile
@@ -1,16 +1,21 @@
 SubDir HAIKU_TOP src add-ons media plugins ape_reader ;
 
-SetSubDirSupportedPlatformsBeOSCompatible ;
-
 UsePrivateHeaders media ;
+SubDirHdrs [ FDirName $(SUBDIR) ../LibMonkeysAudio ] ;
 
 SubDirHdrs [ FDirName $(SUBDIR) LibMonkeysAudio ] ;
 SubDirHdrs [ FDirName $(SUBDIR) MAClib ] ;
 
-Addon ape_reader :
-	APEReader.cpp
-	: libMonkeysAudio.a MAClib.a be libmedia.so [ TargetLibsupc++ ]
-;
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Addon [ MultiArchDefaultGristFiles ape_reader ] :
+			APEReader.cpp
+			: [ MultiArchDefaultGristFiles libMonkeysAudio.a MAClib.a ]
+			be media [ TargetLibsupc++ ]
+		;
+	}
+}
 
 SubInclude HAIKU_TOP src add-ons media plugins ape_reader LibMonkeysAudio ;
 SubInclude HAIKU_TOP src add-ons media plugins ape_reader MAClib ;
diff --git a/src/add-ons/media/plugins/ape_reader/LibMonkeysAudio/Jamfile b/src/add-ons/media/plugins/ape_reader/LibMonkeysAudio/Jamfile
index bae30a0583..b4e8260367 100644
--- a/src/add-ons/media/plugins/ape_reader/LibMonkeysAudio/Jamfile
+++ b/src/add-ons/media/plugins/ape_reader/LibMonkeysAudio/Jamfile
@@ -2,7 +2,12 @@ SubDir HAIKU_TOP src add-ons media plugins ape_reader LibMonkeysAudio ;
 
 SubDirHdrs [ FDirName $(SUBDIR) ../MAClib ] ;
 
-StaticLibrary libMonkeysAudio.a :
-	PositionBridgeIO.cpp
-	LibMonkeysAudio.cpp
-	;
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		StaticLibrary [ MultiArchDefaultGristFiles libMonkeysAudio.a ] :
+			PositionBridgeIO.cpp
+			LibMonkeysAudio.cpp
+		;
+	}
+}
diff --git a/src/add-ons/media/plugins/ape_reader/MAClib/Jamfile b/src/add-ons/media/plugins/ape_reader/MAClib/Jamfile
index 040269f04f..6ec058a4a1 100644
--- a/src/add-ons/media/plugins/ape_reader/MAClib/Jamfile
+++ b/src/add-ons/media/plugins/ape_reader/MAClib/Jamfile
@@ -2,29 +2,34 @@ SubDir HAIKU_TOP src add-ons media plugins ape_reader MAClib ;
 
 SubDirHdrs [ FDirName $(SUBDIR) ../LibMonkeysAudio ] ;
 
-StaticLibrary MAClib.a :
-	APECompress.cpp
-	APECompressCore.cpp
-	APECompressCreate.cpp
-	APEDecompress.cpp
-	APEHeader.cpp
-	APEInfo.cpp
-	APELink.cpp
-	APESimple.cpp
-	APETag.cpp
-	BitArray.cpp
-	CharacterHelper.cpp
-	CircleBuffer.cpp
-	GlobalFunctions.cpp
-	MACProgressHelper.cpp
-	MACLib.cpp
-	MD5.cpp
-	NewPredictor.cpp
-	NNFilter.cpp
-	Prepare.cpp
-	StdLibFileIO.cpp
-	UnBitArray.cpp
-	UnBitArrayBase.cpp
-	WAVInputSource.cpp
-	Assembly.nasm
-	;
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		StaticLibrary [ MultiArchDefaultGristFiles MAClib.a ] :
+			APECompress.cpp
+			APECompressCore.cpp
+			APECompressCreate.cpp
+			APEDecompress.cpp
+			APEHeader.cpp
+			APEInfo.cpp
+			APELink.cpp
+			APESimple.cpp
+			APETag.cpp
+			BitArray.cpp
+			CharacterHelper.cpp
+			CircleBuffer.cpp
+			GlobalFunctions.cpp
+			MACProgressHelper.cpp
+			MACLib.cpp
+			MD5.cpp
+			NewPredictor.cpp
+			NNFilter.cpp
+			Prepare.cpp
+			StdLibFileIO.cpp
+			UnBitArray.cpp
+			UnBitArrayBase.cpp
+			WAVInputSource.cpp
+			Assembly.nasm
+		;
+	}
+}