diff --git a/www-client/netsurf/netsurf-3.6.recipe b/www-client/netsurf/netsurf-3.6.recipe
index 580b3d1e0..1f8305c0b 100644
--- a/www-client/netsurf/netsurf-3.6.recipe
+++ b/www-client/netsurf/netsurf-3.6.recipe
@@ -9,7 +9,7 @@ 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="3"
+REVISION="4"
 # 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"
@@ -76,11 +76,13 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	make TARGET=beos
+	make TARGET=beos PREFIX=$prefix/ DESTDIR=$appsDir NETSURF_BEOS_BIN="/" \
+		BUILD=release $jobArgs
 }
 
 INSTALL()
 {
-	make TARGET=beos DESTDIR=$prefix install
+	make TARGET=beos  PREFIX=$prefix/ DESTDIR=$appsDir NETSURF_BEOS_BIN="/" \
+		BUILD=release install
 	addAppDeskbarSymlink $appsDir/NetSurf
 }
diff --git a/www-client/netsurf/patches/netsurf-3.6.patchset b/www-client/netsurf/patches/netsurf-3.6.patchset
new file mode 100644
index 000000000..a3e107a76
--- /dev/null
+++ b/www-client/netsurf/patches/netsurf-3.6.patchset
@@ -0,0 +1,29 @@
+From 365d7af61f06bce82688568900fe9e10951eed05 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 5 Feb 2017 09:31:55 +0100
+Subject: BeOS: remove resources as separate files
+
+Now bundled into the executable instead.
+
+diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile
+index 19ab43f..114578e 100644
+--- a/frontends/beos/Makefile
++++ b/frontends/beos/Makefile
+@@ -91,14 +91,7 @@ $(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS)
+ 
+ install-beos:
+ 	mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN)
+-	mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ 	@copyattr -d $(EXETARGET) $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
+-	@cp -vRL $(FRONTEND_RESOURCES_DIR)/adblock.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+-	@cp -vRL $(FRONTEND_RESOURCES_DIR)/ca-bundle.txt $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+-	@cp -vRL $(FRONTEND_RESOURCES_DIR)/default.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+-	@cp -vRL $(FRONTEND_RESOURCES_DIR)/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+-	@cp -vRL $(FRONTEND_RESOURCES_DIR)/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+-	@cp -vRL $(FRONTEND_RESOURCES_DIR)/SearchEngines $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ 
+ # ----------------------------------------------------------------------------
+ # Package target
+-- 
+2.7.0
+