diff --git a/www-client/netsurf/netsurf-3.6.recipe b/www-client/netsurf/netsurf-3.6.recipe
index 876d53d58..0a77c0117 100644
--- a/www-client/netsurf/netsurf-3.6.recipe
+++ b/www-client/netsurf/netsurf-3.6.recipe
@@ -9,14 +9,15 @@ developed, NetSurf is continually evolving and improving."
 HOMEPAGE="http://www.netsurf-browser.org/"
 COPYRIGHT="2003-2016 The NetSurf Browser project"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="3"
 # Do NOT use the netsurf-all package. It contains a bunch of subprojects which
 # we build as separate packages so they can easily be used by other projects.
 SOURCE_URI="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="59ae4b50eff9e2a00a0a9742ef546c7de17223139c485af9644f195340979a9c"
 
-ARCHITECTURES="x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
+PATCHES="netsurf-3.6.patchset"
 
 PROVIDES="
 	netsurf$secondaryArchSuffix = $portVersion
@@ -35,6 +36,7 @@ REQUIRES="
 	lib:libutf8proc$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libhubbub$secondaryArchSuffix
+	lib:libwapcaplet$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -74,13 +76,12 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	make TARGET=beos PREFIX=$prefix/ DESTDIR=$appsDir/ BUILD=release \
-		NETSURF_BEOS_BIN=netsurf/ NETSURF_BEOS_RESOURCES=netsurf/res/
+	make TARGET=beos BUILD=release
 }
 
 INSTALL()
 {
-	make TARGET=beos PREFIX=$prefix/ DESTDIR=$appsDir/ \
-		NETSURF_BEOS_BIN=netsurf/ NETSURF_BEOS_RESOURCES=netsurf/res/ install
-	addAppDeskbarSymlink $appsDir/NetSurf NetSurf
+	make TARGET=beos DESTDIR=$prefix install
+
+	addAppDeskbarSymlink $appsDir/NetSurf
 }