diff --git a/build/jam/packages/HaikuSecondary b/build/jam/packages/HaikuSecondary
index 1257052fb1..975f4256aa 100644
--- a/build/jam/packages/HaikuSecondary
+++ b/build/jam/packages/HaikuSecondary
@@ -31,9 +31,9 @@ AddFilesToPackage $(addOnsDir) Translators
 # AddFilesToPackage $(addOnsDir) locale catalogs
 # 	: $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
 #
-# AddFilesToPackage $(addOnsDir) media : $(SYSTEM_ADD_ONS_MEDIA) ;
-# AddFilesToPackage $(addOnsDir) media plugins
-# 	: $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
+#AddFilesToPackage $(addOnsDir) media : $(SYSTEM_ADD_ONS_MEDIA) ;
+AddFilesToPackage $(addOnsDir) media plugins
+	: [ MultiArchDefaultGristFiles $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ] ;
 #
 # AddFilesToPackage $(addOnsDir) disk_systems
 # 	: <disk_system>intel <disk_system>gpt <disk_system>bfs <disk_system>ntfs ;
diff --git a/src/add-ons/media/plugins/ffmpeg/Jamfile b/src/add-ons/media/plugins/ffmpeg/Jamfile
index e05fdfc065..c328056e84 100644
--- a/src/add-ons/media/plugins/ffmpeg/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/Jamfile
@@ -32,29 +32,34 @@ if $(TARGET_ARCH) != x86_64 {
 	;
 }
 
-UseBuildFeatureHeaders ffmpeg ;
-Includes [ FGristFiles $(sources) ]
-	: [ BuildFeatureAttribute ffmpeg : headers ] ;
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		UseBuildFeatureHeaders ffmpeg ;
+		Includes [ FGristFiles $(sources) ]
+			: [ BuildFeatureAttribute ffmpeg : headers ] ;
 
-local ffmpegHeaders = [ BuildFeatureAttribute ffmpeg : headers : path ] ;
-UseHeaders $(ffmpegHeaders) ;
-UseHeaders [ FDirName $(ffmpegHeaders) libavcodec ] ;
-UseHeaders [ FDirName $(ffmpegHeaders) libavdevice ] ;
-UseHeaders [ FDirName $(ffmpegHeaders) libavfilter ] ;
-UseHeaders [ FDirName $(ffmpegHeaders) libavformat ] ;
-UseHeaders [ FDirName $(ffmpegHeaders) libavutil ] ;
-UseHeaders [ FDirName $(ffmpegHeaders) libswscale ] ;
+		local ffmpegHeaders = [ BuildFeatureAttribute ffmpeg : headers : path ] ;
+		UseHeaders $(ffmpegHeaders) ;
+		UseHeaders [ FDirName $(ffmpegHeaders) libavcodec ] ;
+		UseHeaders [ FDirName $(ffmpegHeaders) libavdevice ] ;
+		UseHeaders [ FDirName $(ffmpegHeaders) libavfilter ] ;
+		UseHeaders [ FDirName $(ffmpegHeaders) libavformat ] ;
+		UseHeaders [ FDirName $(ffmpegHeaders) libavutil ] ;
+		UseHeaders [ FDirName $(ffmpegHeaders) libswscale ] ;
 
-Addon ffmpeg :
-	$(sources)
-	:
+		Addon [ MultiArchDefaultGristFiles ffmpeg ] :
+			$(sources)
+			:
 
-	# FFmpeg libraries (from FFmpeg optional package):
-	[ BuildFeatureAttribute ffmpeg : libraries ]
+			# FFmpeg libraries (from FFmpeg optional package):
+			[ BuildFeatureAttribute ffmpeg : libraries ]
 
-	be
-	media
-	$(TARGET_LIBSUPC++)
-;
+			be
+			media
+			$(TARGET_LIBSUPC++)
+		;
+	}
+}
 
 
diff --git a/src/add-ons/media/plugins/raw_decoder/Jamfile b/src/add-ons/media/plugins/raw_decoder/Jamfile
index 4f4f2a3cce..687e790ba9 100644
--- a/src/add-ons/media/plugins/raw_decoder/Jamfile
+++ b/src/add-ons/media/plugins/raw_decoder/Jamfile
@@ -4,9 +4,14 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 
 UsePrivateHeaders media ;
 
-Addon raw_decoder :
-	AudioConversion.cpp
-	RawDecoderPlugin.cpp
-	: be libmedia.so $(TARGET_LIBSUPC++)
-;
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Addon [ MultiArchDefaultGristFiles raw_decoder ] :
+			AudioConversion.cpp
+			RawDecoderPlugin.cpp
+			: be media $(TARGET_LIBSUPC++)
+		;
+	}
+}