diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 10b8cf0633..9f0ee68c1e 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -299,25 +299,18 @@ if [ IsPackageAvailable mesa_devel ] {
 if [ IsPackageAvailable ffmpeg_devel ] {
 	local ffmpegLibs = libavformat.so libavcodec.so libavdevice.so
 		libavfilter.so libswscale.so libavutil.so ;
-	local speexLibs = libspeex.so ;
-	local libtheoraLibs = libtheora.so libtheoradec.so libtheoraenc.so ;
-	local libvorbisLibs = libvorbis.so libvorbisenc.so ;
-	local liboggLibs = libogg.so ;
-	local libvpxLibs = libvpx.so ;
+	
+	ExtractBuildFeatureArchives ffmpeg :
+		file: base ffmpeg
+			runtime: lib
+		file: devel ffmpeg_devel
+			depends: base
+			libraries: $(developLibDir)/$(ffmpegLibs)
+			headers: $(developHeadersDir)
+		;
 
-	local feature ;
-	for feature in ffmpeg speex libtheora libvorbis libogg libvpx {
-		ExtractBuildFeatureArchives $(feature) :
-			file: base $(feature)
-				runtime: lib
-			file: devel $(feature)_devel
-				depends: base
-				libraries: $(developLibDir)/$($(feature)Libs)
-				headers: $(developHeadersDir)
-			;
-
-		EnableBuildFeatures $(feature) ;
-	}
+	EnableBuildFeatures ffmpeg ;
+	
 } else {
 	Echo "FFMpeg support not available on $(TARGET_PACKAGING_ARCH)" ;
 }
diff --git a/src/add-ons/media/plugins/ffmpeg/Jamfile b/src/add-ons/media/plugins/ffmpeg/Jamfile
index 502c519bf0..e05fdfc065 100644
--- a/src/add-ons/media/plugins/ffmpeg/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/Jamfile
@@ -52,18 +52,9 @@ Addon ffmpeg :
 	# FFmpeg libraries (from FFmpeg optional package):
 	[ BuildFeatureAttribute ffmpeg : libraries ]
 
-	[ BuildFeatureAttribute libbz2 : libraries ]
-	[ BuildFeatureAttribute speex : libraries ]
-	[ BuildFeatureAttribute libtheora : libraries ]
-	[ BuildFeatureAttribute libvorbis : libraries ]
-	[ BuildFeatureAttribute libogg : libraries ]
-	[ BuildFeatureAttribute libvpx : libraries ]
-
 	be
 	media
-	[ BuildFeatureAttribute zlib : library ]
 	$(TARGET_LIBSUPC++)
-	$(TARGET_NETWORK_LIBS)
 ;