diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 6b9afd1..cf95373 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,2 +1,5 @@
+AUX 0.9.5-backport-lib-fixes.patch 1145 RMD160 1dd68fcdbe0d446daee2eb6bf600acafd8384ef1 SHA1 adeed9b7f832dfbd5ef183fccac2d032b66213ba SHA256 04b4fb88e71432004b0c4603e64a1d951ce8123f4a1766635ac0e95b20b01cf7
 DIST HandBrake-0.9.4.tar.bz2 1787142 RMD160 a150730cfcb16ee197ba8ec464133e38ab17539e SHA1 91329a83315b7eae0b2b3731a8bf0f2de2a6eb4d SHA256 706b03db4e39446dc47eee2eee298d4aaa3ebd925130e8a84fdc903f231300ee
+DIST HandBrake-0.9.5.tar.bz2 2612437 RMD160 7de96b74e93c9fb7c3fe83a425a7d512e9e811e0 SHA1 6db599fe96a640e5355f1c92b8915f11c7cb45ad SHA256 3a9a89fee6bcaf9677107381a10fc53109630b0a5a201a7d63fd62ae28c9b25b
 EBUILD handbrake-0.9.4.ebuild 1351 RMD160 09565006b83751d779acf2203905ce3fdefa2412 SHA1 171d3a2dd2bd80e50a25cdcd9331e6f019497703 SHA256 689c71010d6efb0cf236b7277f0dc1ab421f82bcd8c9437d4c1b1638fbfb6451
+EBUILD handbrake-0.9.5.ebuild 1610 RMD160 bcc05fc1c4d7d2eb1fe75eb110837cf51d0b252f SHA1 7b00368d212dfb1b2c12c124ab283353f5f17e01 SHA256 1db4f2431e2b710ee8f542d14fa7cd89e1899eb2021540244c3eea4ae43fbb60
diff --git a/media-video/handbrake/files/0.9.5-backport-lib-fixes.patch b/media-video/handbrake/files/0.9.5-backport-lib-fixes.patch
new file mode 100644
index 0000000..34ce2e4
--- /dev/null
+++ b/media-video/handbrake/files/0.9.5-backport-lib-fixes.patch
@@ -0,0 +1,37 @@
+--- a/gtk/configure.ac	2011-03-28 07:30:30.363071931 -0700
++++ b/gtk/configure.ac	2011-03-28 07:30:34.043314605 -0700
+@@ -94,7 +94,7 @@
+ 	mingw_flag=yes
+     ;;
+   *)
+-	GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0 libnotify gudev-1.0"
++	GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0 libnotify dbus-glib-1 gudev-1.0"
+ 	mingw_flag=no
+     ;;
+ esac
+--- a/gtk/src/callbacks.c
++++ b/gtk/src/callbacks.c
+@@ -40,4 +40,8 @@
+ 
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #include <gdk/gdkx.h>
+ #else
+@@ -4894,8 +4894,12 @@
+ 		"Encode Complete",
+ 		"Put down that cocktail, Your HandBrake queue is done!",
+-		"hb-icon",
+-		NULL);
++		"hb-icon"
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++		);
++#else
++		,NULL);
+ 	notify_notification_attach_to_status_icon(notification, si);
++#endif
+ 	g_signal_connect(notification, "closed", (GCallback)notify_closed_cb, ud);
+ 	notify_notification_show(notification, NULL);
+ #endif
diff --git a/media-video/handbrake/handbrake-0.9.5.ebuild b/media-video/handbrake/handbrake-0.9.5.ebuild
new file mode 100644
index 0000000..eb16073
--- /dev/null
+++ b/media-video/handbrake/handbrake-0.9.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit gnome2-utils eutils autotools
+
+MY_PN="HandBrake"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DESCRIPTION="Open-source DVD to MPEG-4 converter"
+HOMEPAGE="http://handbrake.fr/"
+SRC_URI="http://handbrake.fr/rotation.php?file=${MY_PN}-${PV}.tar.bz2
+		-> ${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="css doc gtk"
+RDEPEND="sys-libs/zlib
+	css? ( media-libs/libdvdcss )
+	gtk? (	>=x11-libs/gtk+-2.8
+			dev-libs/glib
+			dev-libs/dbus-glib
+			x11-libs/libnotify
+			media-libs/gstreamer
+			media-libs/gst-plugins-base
+			>=sys-fs/udev-147[extras]
+	)"
+DEPEND="=sys-devel/automake-1.10*
+	=sys-devel/automake-1.4*
+	=sys-devel/automake-1.9*
+	dev-lang/yasm
+	>=dev-lang/python-2.4.6
+	|| ( >=net-misc/wget-1.11.4 >=net-misc/curl-7.19.4 )
+	$RDEPEND"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-backport-lib-fixes.patch"
+	cd gtk
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	! use gtk && myconf="${myconf} --disable-gtk"
+
+	./configure --force --prefix=/usr --disable-gtk-update-checks ${myconf} || die "configure failed"
+}
+
+src_compile() {
+	WANT_AUTOMAKE=1.9 emake -C build || die "failed compiling ${PN}"
+}
+
+src_install() {
+	emake -C build DESTDIR="${D}" install || die "failed installing ${PN}"
+
+	if use doc; then
+		emake -C build doc
+			dodoc AUTHORS CREDITS NEWS THANKS \
+				build/doc/articles/txt/* || die "docs failed"
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}