diff --git a/media-libs/libvpx/libvpx-1.0.0.bep b/media-libs/libvpx/libvpx-1.0.0.bep
new file mode 100644
index 000000000..ce97faebd
--- /dev/null
+++ b/media-libs/libvpx/libvpx-1.0.0.bep
@@ -0,0 +1,24 @@
+DESCRIPTION="libvpx - WebM VP8 Codec SDK"
+HOMEPAGE="http://www.webmproject.org"
+SRC_URI="http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2"
+CHECKSUM_MD5="d987b5140412edd37d2c6b10c29ad484"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+        cd libvpx-v1.0.0
+        ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+        --enable-pic \
+		--enable-vp8
+        make
+}
+	
+INSTALL {
+        cd libvpx-v1.0.0
+        make install
+}
+
+LICENSE="BSD (3-clause)"
+COPYRIGHT="2009-2012 Google Inc., 
+           The Mozilla Foundation and
+           The Xiph.Org Foundation"
diff --git a/media-libs/libvpx/patches/libvpx-1.0.0.patch b/media-libs/libvpx/patches/libvpx-1.0.0.patch
new file mode 100644
index 000000000..da04b72ff
--- /dev/null
+++ b/media-libs/libvpx/patches/libvpx-1.0.0.patch
@@ -0,0 +1,66 @@
+diff -ruN libvpx-v1.0.0/build/make/configure.sh libvpx-v1.0.0-haiku/build/make/configure.sh
+--- libvpx-v1.0.0/build/make/configure.sh	2012-01-27 18:36:39.038535168 +0000
++++ libvpx-v1.0.0-haiku/build/make/configure.sh	2012-03-14 00:47:54.780926976 +0000
+@@ -579,6 +579,9 @@
+             *solaris2.10)
+                 tgt_os=solaris
+                 ;;
++			*haiku*)
++				tgt_os=haiku
++				;;
+         esac
+ 
+         if [ -n "$tgt_isa" ] && [ -n "$tgt_os" ]; then
+@@ -909,8 +912,8 @@
+                 esac
+                 ;;
+             gcc*)
+-                add_cflags  -m${bits}
+-                add_ldflags -m${bits}
++                enabled haiku || add_cflags  -m${bits}
++                enabled haiku || add_ldflags -m${bits}
+                 link_with_cc=gcc
+                 tune_cflags="-march="
+             setup_gnu_toolchain
+@@ -939,7 +942,7 @@
+                 add_asflags -f x64
+                 enabled debug && add_asflags -g cv8
+             ;;
+-            linux*|solaris*)
++            linux*|solaris*|haiku*)
+                 add_asflags -f elf${bits}
+                 enabled debug && [ "${AS}" = yasm ] && add_asflags -g dwarf2
+                 enabled debug && [ "${AS}" = nasm ] && add_asflags -g
+@@ -1019,6 +1022,7 @@
+         case ${toolchain} in
+             *-win*);;
+             *-android-gcc);;
++            *-haiku*);;
+             *) check_header pthread.h && add_extralibs -lpthread
+         esac
+     fi
+diff -ruN libvpx-v1.0.0/configure libvpx-v1.0.0-haiku/configure
+--- libvpx-v1.0.0/configure	2012-01-27 18:36:39.039583744 +0000
++++ libvpx-v1.0.0-haiku/configure	2012-03-14 00:46:37.182976512 +0000
+@@ -107,6 +107,7 @@
+ all_platforms="${all_platforms} x86-darwin9-gcc"
+ all_platforms="${all_platforms} x86-darwin9-icc"
+ all_platforms="${all_platforms} x86-darwin10-gcc"
++all_platforms="${all_platforms} x86-haiku-gcc"
+ all_platforms="${all_platforms} x86-linux-gcc"
+ all_platforms="${all_platforms} x86-linux-icc"
+ all_platforms="${all_platforms} x86-solaris-gcc"
+diff -ruN libvpx-v1.0.0/examples.mk libvpx-v1.0.0-haiku/examples.mk
+--- libvpx-v1.0.0/examples.mk	2012-01-27 18:36:39.040108032 +0000
++++ libvpx-v1.0.0-haiku/examples.mk	2012-03-14 00:46:37.187432960 +0000
+@@ -113,7 +113,9 @@
+ # We should not link to math library (libm) on RVCT
+ # when building for bare-metal targets
+ ifeq ($(CONFIG_OS_SUPPORT), yes)
+-CODEC_EXTRA_LIBS-$(CONFIG_VP8)         += m
++	ifneq ($(TOOLCHAIN),x86-haiku-gcc)
++	CODEC_EXTRA_LIBS-$(CONFIG_VP8)         += m
++	endif
+ else
+     ifeq ($(CONFIG_GCC), yes)
+     CODEC_EXTRA_LIBS-$(CONFIG_VP8)         += m
diff --git a/media-video/ffmpeg/ffmpeg-0.10.bep b/media-video/ffmpeg/ffmpeg-0.10.bep
index f1f2eefb8..4f22f0f13 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.bep
+++ b/media-video/ffmpeg/ffmpeg-0.10.bep
@@ -7,11 +7,12 @@ STATUS_HAIKU="stable"
 DEPEND="media-libs/libogg >= 1.3.0
 	media-libs/speex >= 1.2rc1
 	media-libs/libtheora >= 1.1.0
-	media-libs/libvorbis >= 1.3.2"
+	media-libs/libvorbis >= 1.3.2
+	media-libs/libvpx >= 1.0.0"
 BUILD {
 	cd ffmpeg-0.10
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared \
-		--enable-libvorbis --enable-libspeex --enable-libtheora
+		--enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx
 	make
 }