diff --git a/media-libs/libvpx/ChangeLog b/media-libs/libvpx/ChangeLog
index dc72d19f..2499939d 100644
--- a/media-libs/libvpx/ChangeLog
+++ b/media-libs/libvpx/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for media-libs/libvpx
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.11 2010/12/10 21:46:07 hwoarang Exp $
 
+*libvpx-0.9.5-r1 (04 Feb 2011)
+
+  04 Feb 2011; Mario Fetka <mario.fetka@gmail.com> +libvpx-0.9.5-r1.ebuild,
+  +files/libvpx-0.9.5-enable-shared.patch:
+  bump with multilib patch
+
   10 Dec 2010; Markos Chandras <hwoarang@gentoo.org> libvpx-0.9.5.ebuild:
   Stable on amd64 wrt bug #345559
 
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 85f6e056..b1cf9e87 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,5 +1,7 @@
+AUX libvpx-0.9.5-enable-shared.patch 655 RMD160 a72ba77666e088103a48fb31c445fc12f8163959 SHA1 4ee0feade82667b1e6d42cafcbe4113205482011 SHA256 44239d453714ca62523b299612d2ec279eceb2e74c296de1ef8eb5c8575ad86e
 DIST libvpx-v0.9.5.tar.bz2 1250422 RMD160 e90652a84e6047f5d5f8a0a110b07a324742a74c SHA1 223965ff16737251afb3377c0800d1f8b5f84379 SHA256 2e93968afcded113a7e218de047feecf6659a089058803a9e40fb687de5f9bfa
+EBUILD libvpx-0.9.5-r1.ebuild 1869 RMD160 f85f231b9e58ccf1417a56592067f0aa3a6da69b SHA1 d4f740f09a0f0bbae6d22ecbd0415f62ff3f1130 SHA256 d8fbbcedf9d880121eb494f1e7aee8a64fa95e4ee17138c43dd3d7bb822ec81e
 EBUILD libvpx-0.9.5.ebuild 1656 RMD160 008165250f79d20ffde82d4de3b257130f1fc25c SHA1 98dd96444722076c700c96ca243e46cd0367b228 SHA256 a66be54aa947cb1076ee735f5a3be5b519d46c73258f85da0abfb25b4547da08
 EBUILD libvpx-9999.ebuild 1656 RMD160 008165250f79d20ffde82d4de3b257130f1fc25c SHA1 98dd96444722076c700c96ca243e46cd0367b228 SHA256 a66be54aa947cb1076ee735f5a3be5b519d46c73258f85da0abfb25b4547da08
-MISC ChangeLog 1858 RMD160 68fbe46099bc5e0d87da4031bd2214256c0f23c8 SHA1 144351929090a50880c6e23167c99e21678ff112 SHA256 e8ba9f673025f9143f1679996e93ef47f881dc020ed42f2d626c774b829bee86
+MISC ChangeLog 2037 RMD160 8b5b837b94c25155c0ef324fbaf8771eb66cc0a7 SHA1 f03887542f578b4d476f8a2166d54796e431ad91 SHA256 81d2473cec9d42cb8f8e127a5d51f1a7bcd1351012c0a70bfe34440fdf2469d9
 MISC metadata.xml 517 RMD160 5b8c2af107175fc8be0fd0f3d676dcb1fb1b2bc1 SHA1 a9164f13235a7bce3d266767c1d47bc2be4c3021 SHA256 b94ac8d73429cfe726eb618f80bf11865e682f5129d6268a3182c70b34325734
diff --git a/media-libs/libvpx/files/libvpx-0.9.5-enable-shared.patch b/media-libs/libvpx/files/libvpx-0.9.5-enable-shared.patch
new file mode 100644
index 00000000..0b99f7e0
--- /dev/null
+++ b/media-libs/libvpx/files/libvpx-0.9.5-enable-shared.patch
@@ -0,0 +1,18 @@
+http://bugs.gentoo.org/351496
+http://patch-tracker.debian.org/patch/series/view/libvpx/0.9.5-1/01_enable-shared.patch
+
+--- configure
++++ configure
+@@ -415,12 +415,6 @@
+ }
+ 
+ process_detect() {
+-    if enabled shared; then
+-        # Can only build shared libs on a subset of platforms. Doing this check
+-        # here rather than at option parse time because the target auto-detect
+-        # magic happens after the command line has been parsed.
+-        enabled linux || die "--enable-shared only supported on ELF for now"
+-    fi
+     if [ -z "$CC" ]; then
+         echo "Bypassing toolchain for environment detection."
+         enable external_build
diff --git a/media-libs/libvpx/libvpx-0.9.5-r1.ebuild b/media-libs/libvpx/libvpx-0.9.5-r1.ebuild
new file mode 100644
index 00000000..2ec2f2ea
--- /dev/null
+++ b/media-libs/libvpx/libvpx-0.9.5-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-0.9.5-r1.ebuild,v 1.1 2011/02/03 20:41:47 ssuominen Exp $
+
+EAPI=2
+inherit eutils multilib toolchain-funcs
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git
+	EGIT_REPO_URI="git://review.webmproject.org/${PN}.git"
+	KEYWORDS=""
+elif [[ ${PV} == *pre* ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	MY_P="${PN}-v${PV}"
+	SRC_URI="http://webm.googlecode.com/files/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="WebM VP8 Codec SDK"
+HOMEPAGE="http://www.webmproject.org"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="altivec debug doc mmx postproc sse sse2 sse3 ssse3 +threads"
+
+RDEPEND=""
+DEPEND="amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	doc? (
+		app-doc/doxygen
+		dev-lang/php
+	)
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-enable-shared.patch
+}
+
+src_configure() {
+	tc-export CC
+	archparm=""
+	[ "$ABI" = "x86" ] && archparm="--target=x86-linux-gcc"
+	[ "$ABI" = "x86_64" ] && archparm="--target=x86_64-linux-gcc"                                                                                                                                      	./configure \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		--enable-pic \
+		--enable-vp8 \
+		--enable-shared \
+		$(use_enable altivec) \
+		$(use_enable mmx) \
+		$(use_enable sse) \
+		$(use_enable sse2) \
+		$(use_enable sse3) \
+		$(use_enable ssse3) \
+		$(use_enable debug) \
+		$(use_enable debug debug-libs) \
+		$(use_enable doc install-docs) \
+		$(use_enable postproc) \
+		$(use_enable threads multithread) \
+		$archparm \
+		--as=yasm \
+		|| die
+}
+
+src_install() {
+	# http://bugs.gentoo.org/show_bug.cgi?id=323805
+	emake -j1 DESTDIR="${D}" install || die
+
+	dodoc AUTHORS CHANGELOG README || die
+}