diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index ad68582a63..ca3c2b0333 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -215,17 +215,19 @@ if $(TARGET_ARCH) = x86 {
 local ffmpegBaseURL = http://haiku-files.org/files/optional-packages/lib ;
 if $(TARGET_ARCH) = x86 {
 	if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		HAIKU_FFMPEG_FILE = ffmpeg-0.10-x86-gcc4-2012-03-12.zip ;
+		HAIKU_FFMPEG_FILE = ffmpeg-0.10-x86-gcc4-2012-03-14.zip ;
 		HAIKU_SPEEX_FILE = speex-1.2rc1-x86-gcc4-2012-03-12.zip ;
 		HAIKU_LIBTHEORA_FILE = libtheora-1.1.1-x86-gcc4-2012-03-12.zip ;
 		HAIKU_LIBVORBIS_FILE = libvorbis-1.3.2-x86-gcc4-2012-03-12.zip ;
 		HAIKU_LIBOGG_FILE = libogg-1.3.0-x86-gcc4-2012-03-12.zip ;
+		HAIKU_LIBVPX_FILE = libvpx-1.0.0-x86-gcc4-2012-03-14.zip ;
 	} else {
-		HAIKU_FFMPEG_FILE = ffmpeg-0.10-x86-gcc2-2012-03-11.zip ;
+		HAIKU_FFMPEG_FILE = ffmpeg-0.10-x86-gcc2-2012-03-14.zip ;
 		HAIKU_SPEEX_FILE = speex-1.2rc1-x86-gcc2-2012-03-11.zip ;
 		HAIKU_LIBTHEORA_FILE = libtheora-1.1.1-x86-gcc2-2012-03-11.zip ;
 		HAIKU_LIBVORBIS_FILE = libvorbis-1.3.2-x86-gcc2-2012-03-11.zip ;
 		HAIKU_LIBOGG_FILE = libogg-1.3.0-x86-gcc2-2012-03-11.zip ;
+		HAIKU_LIBVPX_FILE = libvpx-1.0.0-x86-gcc2-2012-03-14.zip ;
 	}
 
 	local ffmpegZipFile = [ DownloadFile $(HAIKU_FFMPEG_FILE)
@@ -238,6 +240,8 @@ if $(TARGET_ARCH) = x86 {
 		: $(ffmpegBaseURL)/$(HAIKU_LIBVORBIS_FILE) ] ;
 	local liboggZipFile = [ DownloadFile $(HAIKU_LIBOGG_FILE)
 		: $(ffmpegBaseURL)/$(HAIKU_LIBOGG_FILE) ] ;
+	local libvpxZipFile = [ DownloadFile $(HAIKU_LIBVPX_FILE)
+		: $(ffmpegBaseURL)/$(HAIKU_LIBVPX_FILE) ] ;
 
 	HAIKU_FFMPEG_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
 		$(HAIKU_FFMPEG_FILE:B) ] ;
@@ -249,6 +253,8 @@ if $(TARGET_ARCH) = x86 {
 		$(HAIKU_LIBVORBIS_FILE:B) ] ;
 	HAIKU_LIBOGG_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
 		$(HAIKU_LIBOGG_FILE:B) ] ;
+	HAIKU_LIBVPX_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
+		$(HAIKU_LIBVPX_FILE:B) ] ;
 
 	HAIKU_FFMPEG_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_FFMPEG_DIR)
 		: common/include/ : $(ffmpegZipFile) : extracted-ffmpeg ] ;
@@ -260,6 +266,8 @@ if $(TARGET_ARCH) = x86 {
 		: common/include/ : $(libvorbisZipFile) : extracted-libvorbis ] ;
 	HAIKU_LIBOGG_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_LIBOGG_DIR)
 		: common/include/ : $(liboggZipFile) : extracted-libogg ] ;
+	HAIKU_LIBVPX_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_LIBVPX_DIR)
+		: common/include/ : $(libvpxZipFile) : extracted-libvpx ] ;
 
 	HAIKU_FFMPEG_LIBS = [ ExtractArchive $(HAIKU_FFMPEG_DIR)
 		:
@@ -306,12 +314,19 @@ if $(TARGET_ARCH) = x86 {
 		: extracted-libogg ] ;
 	Depends $(HAIKU_LIBOGG_LIBS) : $(HAIKU_LIBOGG_HEADERS_DEPENDENCY) ;
 
+	HAIKU_LIBVPX_LIBS = [ ExtractArchive $(HAIKU_LIBVPX_DIR)
+		:
+		common/lib/libvpx.a
+		: $(libvpxZipFile)
+		: extracted-libvpx ] ;
+	Depends $(HAIKU_LIBVPX_LIBS) : $(HAIKU_LIBVPX_HEADERS_DEPENDENCY) ;
 
 	HAIKU_FFMPEG_HEADERS = [ FDirName $(HAIKU_FFMPEG_DIR) common include ] ;
 	HAIKU_SPEEX_HEADERS = [ FDirName $(HAIKU_SPEEX_DIR) common include ] ;
 	HAIKU_LIBTHEORA_HEADERS = [ FDirName $(HAIKU_LIBTHEORA_DIR) common include ] ;
 	HAIKU_LIBVORBIS_HEADERS = [ FDirName $(HAIKU_LIBVORBIS_DIR) common include ] ;
 	HAIKU_LIBOGG_HEADERS = [ FDirName $(HAIKU_LIBOGG_DIR) common include ] ;
+	HAIKU_LIBVPX_HEADERS = [ FDirName $(HAIKU_LIBVPX_DIR) common include ] ;
 
 } else {
 	Echo "FFMpeg support not available on $(TARGET_ARCH)" ;
diff --git a/src/add-ons/media/plugins/ffmpeg/Jamfile b/src/add-ons/media/plugins/ffmpeg/Jamfile
index 4ca2eecb23..0ac75227b0 100644
--- a/src/add-ons/media/plugins/ffmpeg/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/Jamfile
@@ -51,6 +51,7 @@ Addon ffmpeg :
 	$(HAIKU_LIBTHEORA_LIBS)
 	$(HAIKU_LIBVORBIS_LIBS)
 	$(HAIKU_LIBOGG_LIBS)
+	$(HAIKU_LIBVPX_LIBS)
 	libbz2_ffmpeg.a
 
 	be