diff --git a/media-video/handbrake/handbrake-1.1.2.recipe b/media-video/handbrake/handbrake-1.1.2.recipe
index c01f5480b..b0b494ea9 100644
--- a/media-video/handbrake/handbrake-1.1.2.recipe
+++ b/media-video/handbrake/handbrake-1.1.2.recipe
@@ -14,7 +14,7 @@ PATCHES="handbrake-$portVersion.patchset"
 ADDITIONAL_FILES="HandBrake.rdef"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	handbrake$secondaryArchSuffix = $portVersion
@@ -22,7 +22,6 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:liba52$secondaryArchSuffix
 	lib:libass$secondaryArchSuffix
 	lib:libavcodec$secondaryArchSuffix
 	lib:libbluray$secondaryArchSuffix
@@ -52,17 +51,13 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:liba52$secondaryArchSuffix
 	devel:libass$secondaryArchSuffix
 	devel:libavcodec$secondaryArchSuffix
-	devel:libbluray$secondaryArchSuffix
+	devel:libbluray$secondaryArchSuffix >= 2
 	devel:libbz2$secondaryArchSuffix
 	devel:libdvdnav$secondaryArchSuffix
 	devel:libdvdread$secondaryArchSuffix
-	devel:libfontconfig$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
-	devel:libfribidi$secondaryArchSuffix
-	devel:libharfbuzz$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libjansson$secondaryArchSuffix
 	devel:libmkv$secondaryArchSuffix
@@ -81,15 +76,11 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
-	cmd:cmake
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:autoconf
-	cmd:automake
+	cmd:m4
+	cmd:make
 	cmd:patch
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python2
-	cmd:m4
-	cmd:make
 	cmd:sed
 	cmd:tar
 	cmd:yasm
@@ -101,16 +92,21 @@ BUILD_PREREQUIRES="
 PATCH()
 {
 	sed -i 's/MODULES += contrib\/.*//g' make/include/main.defs
+	INCLUDE_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir
+	sed -i "s|/system/develop/headers|$INCLUDE_DIR|g" libhb/module.defs
+	sed -i 's/i686/i586/g' make/include/gcc.defs
 }
 
 BUILD()
 {
 	./configure --prefix=$prefix --force --disable-x265
+	cd build
 	make $jobArgs
 }
 
 INSTALL()
 {
+	cd build
 	make install
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
diff --git a/media-video/handbrake/patches/handbrake-1.1.2.patchset b/media-video/handbrake/patches/handbrake-1.1.2.patchset
index 858333d89..0cc648d1d 100644
--- a/media-video/handbrake/patches/handbrake-1.1.2.patchset
+++ b/media-video/handbrake/patches/handbrake-1.1.2.patchset
@@ -2691,7 +2691,7 @@ index c703272..d61dd38 100644
  GCC.start      = 1
  GCC.end        = 1
  GCC.args.dylib = -shared
-+GCC.args.extra = -lnetwork -liconv
++GCC.args.extra.exe++ = -lnetwork -liconv
  GCC.args.pic   = 1
  
  GCC.args.g.none = -g0