diff --git a/media-libs/libvpx/libvpx4-1.6.1.recipe b/media-libs/libvpx/libvpx4-1.6.1.recipe
new file mode 100644
index 000000000..ad16cc1e0
--- /dev/null
+++ b/media-libs/libvpx/libvpx4-1.6.1.recipe
@@ -0,0 +1,91 @@
+SUMMARY="WebM VP8 video codec library"
+DESCRIPTION="The WebM VP8 SDK allows you to integrate your applications with \
+the VP8 video codec, a high quality, royalty free, open source codec deployed \
+on millions of computers and devices worldwide.
+
+This distribution of the WebM VP8 Codec SDK includes the following support:
+- WebM VP8 Encoder
+- WebM VP8 Decoder"
+HOMEPAGE="http://www.webmproject.org"
+COPYRIGHT="2009-2012 Google Inc.,
+	The Mozilla Foundation and
+	The Xiph.Org Foundation"
+LICENSE="BSD (3-clause)"
+REVISION="1"
+SOURCE_URI="https://github.com/webmproject/libvpx/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="cda8bb6f0e4848c018177d3a576fa83ed96d762554d7010fe4cfb9d70c22e588"
+SOURCE_DIR="libvpx-$portVersion"
+PATCHES="libvpx-$portVersion.patchset"
+
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="?x86"
+
+PROVIDES="
+	libvpx$secondaryArchSuffix = $portVersion
+	cmd:vpxdec = $portVersion compat >= 1
+	cmd:vpxenc = $portVersion compat >= 1
+	lib:libvpx$secondaryArchSuffix = 4.1.0 compat >= 4
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libvpx${secondaryArchSuffix}_devel = $portVersion
+	devel:libvpx$secondaryArchSuffix = 4.1.0 compat >= 4
+	"
+REQUIRES_devel="
+	libvpx$secondaryArchSuffix == $portVersion
+	"
+CONFLICTS_devel="
+	libvpx3${secondaryArchSuffix}_devel
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+	# Note: The build system also looks for libvorbis and SDL, but that seems
+	# to be needed only for building the sample player, which we don't need.
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:awk
+	cmd:make
+	cmd:perl
+	cmd:yasm
+	cmd:egrep
+	cmd:grep
+	cmd:sed
+	cmd:find
+	cmd:xargs
+	cmd:diff
+	"
+
+BUILD()
+{
+	# not an auto tools configure
+	./configure \
+		--prefix="$prefix" \
+		--libdir="$libDir" \
+		--as=yasm \
+		--enable-pic \
+		--enable-shared \
+		--enable-vp8
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libvpx
+	fixPkgconfig
+
+	mkdir -p $includeDir
+	mv $prefix/include/* $includeDir
+	rmdir $prefix/include
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
diff --git a/media-libs/libvpx/patches/libvpx-1.6.1.patchset b/media-libs/libvpx/patches/libvpx-1.6.1.patchset
new file mode 100644
index 000000000..7df69e120
--- /dev/null
+++ b/media-libs/libvpx/patches/libvpx-1.6.1.patchset
@@ -0,0 +1,195 @@
+From 007a4b94ca2106d238641675df07335fa647cc02 Mon Sep 17 00:00:00 2001
+From: korli <jerome.duval@gmail.com>
+Date: Wed, 14 Mar 2012 00:15:38 +0000
+Subject: patch for 1.0.0
+
+
+diff --git a/build/make/configure.sh b/build/make/configure.sh
+index 007e020..430c5ed 100644
+--- a/build/make/configure.sh
++++ b/build/make/configure.sh
+@@ -741,6 +741,9 @@ process_common_toolchain() {
+       *os2*)
+         tgt_os=os2
+         ;;
++      *haiku*)
++        tgt_os=haiku
++        ;;
+     esac
+ 
+     if [ -n "$tgt_isa" ] && [ -n "$tgt_os" ]; then
+@@ -1228,8 +1231,8 @@ EOF
+ EOF
+       case ${tgt_cc} in
+         gcc*)
+-          add_cflags -m${bits}
+-          add_ldflags -m${bits}
++          enabled haiku || add_cflags -m${bits}
++          enabled haiku || add_ldflags -m${bits}
+           ;;
+       esac
+ 
+@@ -1286,7 +1289,7 @@ EOF
+           enabled debug && add_asflags -g cv8
+           EXE_SFX=.exe
+           ;;
+-        linux*|solaris*|android*)
++        linux*|solaris*|android*|haiku*)
+           add_asflags -f elf${bits}
+           enabled debug && [ "${AS}" = yasm ] && add_asflags -g dwarf2
+           enabled debug && [ "${AS}" = nasm ] && add_asflags -g
+@@ -1398,6 +1401,8 @@ EOF
+       *-android-gcc)
+         # bionic includes basic pthread functionality, obviating -lpthread.
+         ;;
++      *-haiku*)
++        ;;
+       *)
+         check_header pthread.h && add_extralibs -lpthread
+         ;;
+diff --git a/configure b/configure
+index fb732ac..0d8ff63 100755
+--- a/configure
++++ b/configure
+@@ -125,6 +125,7 @@ all_platforms="${all_platforms} x86-darwin12-gcc"
+ all_platforms="${all_platforms} x86-darwin13-gcc"
+ all_platforms="${all_platforms} x86-darwin14-gcc"
+ all_platforms="${all_platforms} x86-darwin15-gcc"
++all_platforms="${all_platforms} x86-haiku-gcc"
+ all_platforms="${all_platforms} x86-iphonesimulator-gcc"
+ all_platforms="${all_platforms} x86-linux-gcc"
+ all_platforms="${all_platforms} x86-linux-icc"
+diff --git a/examples.mk b/examples.mk
+index 38c4d75..8122b15 100644
+--- a/examples.mk
++++ b/examples.mk
+@@ -246,8 +246,10 @@ endif
+ # 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
+-CODEC_EXTRA_LIBS-$(CONFIG_VP9)         += m
++    ifneq ($(TOOLCHAIN),x86-haiku-gcc)
++    CODEC_EXTRA_LIBS-$(CONFIG_VP8)         += m
++    CODEC_EXTRA_LIBS-$(CONFIG_VP9)         += m
++    endif
+ else
+     ifeq ($(CONFIG_GCC), yes)
+     CODEC_EXTRA_LIBS-$(CONFIG_VP8)         += m
+-- 
+2.13.1
+
+
+From 6b4d6b6e4f30fd9ed6d5804871877351fa5170bf Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Tue, 11 Jun 2013 21:09:11 +0200
+Subject: configure: enable shared library building for Haiku
+
+
+diff --git a/configure b/configure
+index 0d8ff63..1575ad7 100755
+--- a/configure
++++ b/configure
+@@ -497,7 +497,7 @@ process_detect() {
+         # here rather than at option parse time because the target auto-detect
+         # magic happens after the command line has been parsed.
+         case "${tgt_os}" in
+-        linux|os2|darwin*|iphonesimulator*)
++        linux|haiku|os2|darwin*|iphonesimulator*)
+             # Supported platforms
+             ;;
+         *)
+-- 
+2.13.1
+
+
+From 3b1ccefbff849dfdaa165a5de740a0e3be0bdfc9 Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Tue, 11 Jun 2013 21:09:28 +0200
+Subject: libs.mk: no -lm or -lpthread on Haiku
+
+
+diff --git a/libs.mk b/libs.mk
+index 36935bd..fef8cbb 100644
+--- a/libs.mk
++++ b/libs.mk
+@@ -269,7 +269,6 @@ LIBS-$(CONFIG_SHARED) += $(BUILD_PFX)$(LIBVPX_SO)\
+                            $(notdir $(LIBVPX_SO_SYMLINKS)) \
+                            $(if $(LIBVPX_SO_IMPLIB), $(BUILD_PFX)$(LIBVPX_SO_IMPLIB))
+ $(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) $(EXPORT_FILE)
+-$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm
+ $(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(SO_VERSION_MAJOR)
+ $(BUILD_PFX)$(LIBVPX_SO): EXPORTS_FILE = $(EXPORT_FILE)
+ 
+@@ -332,11 +331,11 @@ vpx.pc: config.mk libs.mk
+ 	$(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)' >> $@
+ 	$(qexec)echo 'Requires:' >> $@
+ 	$(qexec)echo 'Conflicts:' >> $@
+-	$(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@
++	$(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
+ ifeq ($(HAVE_PTHREAD_H),yes)
+-	$(qexec)echo 'Libs.private: -lm -lpthread' >> $@
++	$(qexec)echo 'Libs.private: -lpthread' >> $@
+ else
+-	$(qexec)echo 'Libs.private: -lm' >> $@
++	$(qexec)echo 'Libs.private: ' >> $@
+ endif
+ 	$(qexec)echo 'Cflags: -I$${includedir}' >> $@
+ INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
+@@ -506,7 +505,7 @@ TEST_LIBS := lib$(CODEC_LIB)$(CODEC_LIB_SUF) libgtest.a
+ $(LIBVPX_TEST_BIN): $(TEST_LIBS)
+ $(eval $(call linkerxx_template,$(LIBVPX_TEST_BIN), \
+               $(LIBVPX_TEST_OBJS) \
+-              -L. -lvpx -lgtest $(extralibs) -lm))
++              -L. -lvpx -lgtest $(extralibs)))
+ 
+ ifneq ($(strip $(TEST_INTRA_PRED_SPEED_OBJS)),)
+ $(TEST_INTRA_PRED_SPEED_OBJS) $(TEST_INTRA_PRED_SPEED_OBJS:.o=.d): CXXFLAGS += $(GTEST_INCLUDES)
+@@ -516,7 +515,7 @@ BINS-yes += $(TEST_INTRA_PRED_SPEED_BIN)
+ $(TEST_INTRA_PRED_SPEED_BIN): $(TEST_LIBS)
+ $(eval $(call linkerxx_template,$(TEST_INTRA_PRED_SPEED_BIN), \
+               $(TEST_INTRA_PRED_SPEED_OBJS) \
+-              -L. -lvpx -lgtest $(extralibs) -lm))
++              -L. -lvpx -lgtest $(extralibs)))
+ endif  # TEST_INTRA_PRED_SPEED
+ 
+ endif  # CONFIG_UNIT_TESTS
+-- 
+2.13.1
+
+
+From bf47e1ac552bf9e9e722ab4a6549690f6470bacb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
+Date: Tue, 3 Dec 2013 22:18:36 +0000
+Subject: x86_64 support
+
+* configure, amples.mk
+
+diff --git a/configure b/configure
+index 1575ad7..c82c8ec 100755
+--- a/configure
++++ b/configure
+@@ -144,6 +144,7 @@ all_platforms="${all_platforms} x86_64-darwin12-gcc"
+ all_platforms="${all_platforms} x86_64-darwin13-gcc"
+ all_platforms="${all_platforms} x86_64-darwin14-gcc"
+ all_platforms="${all_platforms} x86_64-darwin15-gcc"
++all_platforms="${all_platforms} x86_64-haiku-gcc"
+ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
+ all_platforms="${all_platforms} x86_64-linux-gcc"
+ all_platforms="${all_platforms} x86_64-linux-icc"
+diff --git a/examples.mk b/examples.mk
+index 8122b15..e45b7d8 100644
+--- a/examples.mk
++++ b/examples.mk
+@@ -246,7 +246,7 @@ endif
+ # We should not link to math library (libm) on RVCT
+ # when building for bare-metal targets
+ ifeq ($(CONFIG_OS_SUPPORT), yes)
+-    ifneq ($(TOOLCHAIN),x86-haiku-gcc)
++    ifeq (,$(findstring haiku,$(TOOLCHAIN)))
+     CODEC_EXTRA_LIBS-$(CONFIG_VP8)         += m
+     CODEC_EXTRA_LIBS-$(CONFIG_VP9)         += m
+     endif
+-- 
+2.13.1
+