diff --git a/dev-libs/libcss/libcss-0.8.0.recipe b/dev-libs/libcss/libcss-0.9.0.recipe
similarity index 89%
rename from dev-libs/libcss/libcss-0.8.0.recipe
rename to dev-libs/libcss/libcss-0.9.0.recipe
index 9d70d4832..277b2355b 100644
--- a/dev-libs/libcss/libcss-0.8.0.recipe
+++ b/dev-libs/libcss/libcss-0.9.0.recipe
@@ -6,7 +6,7 @@ COPYRIGHT="2007-2018 The NetSurf Developers"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libcss-$portVersion-src.tar.gz"
-CHECKSUM_SHA256="35a0490d98c23e09b8d2b5e4619926131c5b98da7a9db2ed00322f63fbc2ad5f"
+CHECKSUM_SHA256="b98fba7664bd5307cb39a6101098da76f635a97e157b87f45e9ce42ada9089ef"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -35,11 +35,11 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
-	devel:libparserutils$secondaryArchSuffix >= 0.2.3
-	devel:libwapcaplet$secondaryArchSuffix >= 0.3.1
+	devel:libparserutils$secondaryArchSuffix >= 0.2.4
+	devel:libwapcaplet$secondaryArchSuffix >= 0.4.2
 	"
 BUILD_PREREQUIRES="
-	netsurf_buildsystem >= 1.6
+	netsurf_buildsystem >= 1.8
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/dev-libs/libnslog/libnslog-0.1.2.recipe b/dev-libs/libnslog/libnslog-0.1.2.recipe
index b36cf5301..e3224c9f8 100644
--- a/dev-libs/libnslog/libnslog-0.1.2.recipe
+++ b/dev-libs/libnslog/libnslog-0.1.2.recipe
@@ -5,7 +5,7 @@ applications."
 HOMEPAGE="http://git.netsurf-browser.org/libnslog.git/"
 COPYRIGHT="2014-2018 Vincent Sanders"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libnslog-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="4d12d836efd55a87e4f6429aa5527e1e15526fa4cac58b7879cba1db7737fabd"
 
@@ -25,7 +25,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libnslog${secondaryArchSuffix}_devel = $portVersion
-	devel:libnslog$secondaryArchSuffix = $libVersionCompat
+	devel:libnslog$secondaryArchSuffix = $libVersion compat = $libVersionCompat
 	"
 REQUIRES_devel="
 	libnslog$secondaryArchSuffix == $portVersion base
diff --git a/dev-libs/libnsutils/libnsutils-0.0.5.recipe b/dev-libs/libnsutils/libnsutils-0.0.5.recipe
index 172074160..8b7e6dd29 100644
--- a/dev-libs/libnsutils/libnsutils-0.0.5.recipe
+++ b/dev-libs/libnsutils/libnsutils-0.0.5.recipe
@@ -4,7 +4,7 @@ other applications."
 HOMEPAGE="https://git.netsurf-browser.org/libnsutils.git/"
 COPYRIGHT="2014-2018 Vincent Sanders"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libnsutils-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="0e3b7a19f4348f25a1cac514bebfdc941e044dab9dcb1cb9c131067d7bcc8127"
 
@@ -24,7 +24,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libnsutils${secondaryArchSuffix}_devel = $portVersion
-	devel:libnsutils$secondaryArchSuffix = $libVersionCompat
+	devel:libnsutils$secondaryArchSuffix = $libVersion compat = $libVersionCompat
 	"
 REQUIRES_devel="
 	libnsutils$secondaryArchSuffix == $portVersion base
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4.recipe b/dev-libs/libparserutils/libparserutils-0.2.4.recipe
index 88e63d671..cefabcb0a 100644
--- a/dev-libs/libparserutils/libparserutils-0.2.4.recipe
+++ b/dev-libs/libparserutils/libparserutils-0.2.4.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="LibParserUtils is a library for building efficient parsers."
 HOMEPAGE="https://www.netsurf-browser.org/projects/libparserutils/"
 COPYRIGHT="2007-2018 J-M Bell"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libparserutils-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="322bae61b30ccede3e305bf6eae2414920649775bc5ff1d1b688012a3c4947d8"
 
@@ -24,7 +24,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libparserutils${secondaryArchSuffix}_devel = $portVersion
-	devel:libparserutils$secondaryArchSuffix = $libVersionCompat
+	devel:libparserutils$secondaryArchSuffix = $libVersion compat = $libVersionCompat
 	"
 REQUIRES_devel="
 	libparserutils$secondaryArchSuffix == $portVersion base
diff --git a/dev-libs/libutf8proc/libutf8proc-1.3.1~3.recipe b/dev-libs/libutf8proc/libutf8proc-1.3.1~3.recipe
deleted file mode 100644
index 7ef2c9330..000000000
--- a/dev-libs/libutf8proc/libutf8proc-1.3.1~3.recipe
+++ /dev/null
@@ -1,66 +0,0 @@
-SUMMARY="A library for processing UTF-8 encoded Unicode strings"
-DESCRIPTION="utf8proc is a small, clean C library that provides Unicode \
-normalization, case-folding, and other operations for data in the UTF-8 \
-encoding, supporting Unicode version 7.0."
-HOMEPAGE="https://julialang.org/utf8proc/"
-COPYRIGHT="2006-2017 Public Software Group"
-LICENSE="MIT"
-REVISION="3"
-SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libutf8proc-1.3.1-3-src.tar.gz"
-CHECKSUM_SHA256="1223c2dd9c5cd077564feb30a6ad8b1c0e55ef5dfe7c275d3b9fe8274f207c70"
-SOURCE_DIR="libutf8proc-1.3.1-3"
-
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	libutf8proc$secondaryArchSuffix = $portVersion
-	lib:libutf8proc$secondaryArchSuffix = 1.3.1 compat >= 1
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	libutf8proc${secondaryArchSuffix}_devel = $portVersion
-	devel:libutf8proc$secondaryArchSuffix = 1.3.1 compat >= 1
-	"
-REQUIRES_devel="
-	libutf8proc$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	netsurf_buildsystem >= 1.7
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
-	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-		COMPONENT_TYPE=lib-shared
-}
-
-INSTALL()
-{
-	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-		INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir
-	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-		INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir COMPONENT_TYPE=lib-shared
-
-	# No idea, why the makefile puts it here, but it should be in the root.
-	mv $includeDir/libutf8proc/* $includeDir
-	rm -rf $includeDir/libutf8proc
-
-	mkdir -p $prefix/develop/lib
-
-	prepareInstalledDevelLib libutf8proc
-	fixPkgconfig
-
-	packageEntries devel $developDir
-}
diff --git a/dev-libs/libutf8proc/libutf8proc2-2.4.0.1.recipe b/dev-libs/libutf8proc/libutf8proc2-2.4.0.1.recipe
new file mode 100644
index 000000000..bc96ca753
--- /dev/null
+++ b/dev-libs/libutf8proc/libutf8proc2-2.4.0.1.recipe
@@ -0,0 +1,81 @@
+SUMMARY="A library for processing UTF-8 encoded Unicode strings"
+DESCRIPTION="utf8proc is a small, clean C library that provides Unicode \
+normalization, case-folding, and other operations for data in the UTF-8 \
+encoding, supporting Unicode version 7.0."
+HOMEPAGE="https://julialang.org/utf8proc/"
+COPYRIGHT="2006-2019 Public Software Group
+	2014-2019 Steven G. Johnson, Jiahao Chen, Tony Kelman, Jonas Fonseca, \
+	and other contributors listed in the git history"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libutf8proc-2.4.0-1-src.tar.gz"
+SOURCE_DIR="libutf8proc-2.4.0-1"
+CHECKSUM_SHA256="01ab1d6989c1c7755090db24c3f64e49f95c560ae49c26bec5142bac6802c472"
+
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="2"
+libVersionCompat="$libVersion compat >= ${libVersion}"
+
+PROVIDES="
+	libutf8proc2$secondaryArchSuffix = $portVersion
+	lib:libutf8proc$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libutf8proc2${secondaryArchSuffix}_devel = $portVersion
+	devel:libutf8proc$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	libutf8proc2$secondaryArchSuffix == $portVersion base
+	"
+CONFLICTS_devel="
+	libutf8proc${secondaryArchSuffix}_devel
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	netsurf_buildsystem >= 1.8
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+defineDebugInfoPackage libutf8proc2$secondaryArchSuffix \
+	$libDir/libutf8proc.so.$libVersion
+
+BUILD()
+{
+	for linkage in lib-static lib-shared; do
+		make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \
+			COMPONENT_TYPE=$linkage
+	done
+}
+
+INSTALL()
+{
+	for linkage in lib-static lib-shared; do
+		make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \
+			COMPONENT_TYPE=$linkage \
+			INCLUDEDIR=$relativeIncludeDir install \
+			LIBDIR=$relativeLibDir
+	done
+
+	prepareInstalledDevelLib libutf8proc
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		"$developDir"
+}
+
+TEST()
+{
+	cd build_haiku
+#	make check # test cases not supported yet with cmake
+}
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.1.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.4.2.recipe
similarity index 82%
rename from dev-libs/libwapcaplet/libwapcaplet-0.4.1.recipe
rename to dev-libs/libwapcaplet/libwapcaplet-0.4.2.recipe
index 4436ce3c1..befbdecc9 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.1.recipe
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.2.recipe
@@ -3,14 +3,14 @@ DESCRIPTION="LibWapcaplet is a string internment library.
 It provides reference counted string interment and rapid string comparison \
 functionality."
 HOMEPAGE="https://www.netsurf-browser.org/projects/libwapcaplet/"
-COPYRIGHT="2009-2018 The NetSurf Browser project"
+COPYRIGHT="2009-2019 The NetSurf Browser project"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libwapcaplet-$portVersion-src.tar.gz"
-CHECKSUM_SHA256="c8ff6ea5b64feda806f5b79ba970442f5edb237046a044bc0f7e4d54a9a4978c"
+CHECKSUM_SHA256="063d248ab3f206808c414934a105f6cb6426e2f0baf3bdd20a712179ecfa5cba"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
 
 libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
@@ -25,7 +25,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libwapcaplet${secondaryArchSuffix}_devel = $portVersion
-	devel:libwapcaplet$secondaryArchSuffix = $libVersionCompat
+	devel:libwapcaplet$secondaryArchSuffix = $libVersion compat = $libVersionCompat
 	"
 REQUIRES_devel="
 	libwapcaplet$secondaryArchSuffix == $portVersion base
@@ -33,7 +33,7 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	netsurf_buildsystem
+	netsurf_buildsystem >= 1.8
 	devel:libcheck$secondaryArchSuffix
 	lib:libcheck$secondaryArchSuffix
 	"
diff --git a/dev-libs/nsgenbind/nsgenbind-0.6.recipe b/dev-libs/nsgenbind/nsgenbind-0.7.recipe
similarity index 83%
rename from dev-libs/nsgenbind/nsgenbind-0.6.recipe
rename to dev-libs/nsgenbind/nsgenbind-0.7.recipe
index 3aef1a445..952dda7e4 100644
--- a/dev-libs/nsgenbind/nsgenbind-0.6.recipe
+++ b/dev-libs/nsgenbind/nsgenbind-0.7.recipe
@@ -2,16 +2,14 @@ SUMMARY="NetSurf generator for javascript bindings"
 DESCRIPTION="This is a tool to generate JavaScript to DOM bindings from w3c \
 webidl files and a binding configuration file."
 HOMEPAGE="https://git.netsurf-browser.org/nsgenbind.git/"
-COPYRIGHT="2012-2018 Vincent Sanders"
+COPYRIGHT="2012-2019 Vincent Sanders"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://download.netsurf-browser.org/libs/releases/nsgenbind-$portVersion-src.tar.gz"
-CHECKSUM_SHA256="92f75414635b857abd9a4e2c119a517e797d247df5db30284e3dbaf273582c6c"
+CHECKSUM_SHA256="18632ea90fc98984771b4996a2f4fc06bd5f1bab33bf0379e4523b45fcacf466"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
-if [ "$targetArchitecture" = x86_gcc2 ]; then
 SECONDARY_ARCHITECTURES="x86"
-fi
 
 PROVIDES="
 	nsgenbind$secondaryArchSuffix = $portVersion
@@ -23,7 +21,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	netsurf_buildsystem
+	netsurf_buildsystem >= 1.8
 	"
 BUILD_PREREQUIRES="
 	cmd:bison
diff --git a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.5.recipe b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.5.recipe
deleted file mode 100644
index d9067595e..000000000
--- a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.5.recipe
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY="NetSurf build framework"
-DESCRIPTION="NetSurf build framework for compiling some of their libraries."
-HOMEPAGE="http://git.netsurf-browser.org/buildsystem.git/"
-COPYRIGHT="2009-2016 The NetSurf Browser project"
-LICENSE="MIT"
-REVISION="2"
-SOURCE_URI="http://download.netsurf-browser.org/libs/releases/buildsystem-$portVersion.tar.gz"
-CHECKSUM_SHA256="dbc6afc639f6987b704e6ff4427668787ee7efba77e1bbf76b614699b5daaf71"
-SOURCE_DIR="buildsystem-$portVersion"
-
-ARCHITECTURES="any"
-DISABLE_SOURCE_PACKAGE="yes"
-
-PROVIDES="
-	netsurf_buildsystem = $portVersion
-	"
-REQUIRES="
-	haiku
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:make
-	"
-
-BUILD()
-{
-	# no-op
-	true
-}
-
-INSTALL()
-{
-	make install PREFIX=$prefix BASE=$prefix/data/netsurf-buildsystem
-}
diff --git a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.8.recipe b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.8.recipe
new file mode 100644
index 000000000..81852cdb8
--- /dev/null
+++ b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.8.recipe
@@ -0,0 +1,38 @@
+SUMMARY="NetSurf build framework"
+DESCRIPTION="NetSurf build framework for compiling some of their libraries."
+HOMEPAGE="https://git.netsurf-browser.org/buildsystem.git/"
+COPYRIGHT="2009-2019 The NetSurf Browser project"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="https://download.netsurf-browser.org/libs/releases/buildsystem-$portVersion.tar.gz"
+SOURCE_FILENAME="netsurf-buildsystem-$portVersion.tar.gz"
+SOURCE_DIR="buildsystem-$portVersion"
+CHECKSUM_SHA256="e6a324e7c5965ca032d3196adddd6fd986b5f47c0e6340a646d0d23e3597cd39"
+
+ARCHITECTURES="any"
+DISABLE_SOURCE_PACKAGE="yes"
+
+PROVIDES="
+	netsurf_buildsystem = $portVersion
+	"
+REQUIRES="
+	haiku
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	"
+
+BUILD()
+{
+	# no-op
+	true
+}
+
+INSTALL()
+{
+	make install PREFIX="$prefix" BASE="$prefix"/data/netsurf-buildsystem
+}
diff --git a/media-libs/libnsbmp/libnsbmp-0.1.3.recipe b/media-libs/libnsbmp/libnsbmp-0.1.3.recipe
deleted file mode 100644
index 6f956ebd2..000000000
--- a/media-libs/libnsbmp/libnsbmp-0.1.3.recipe
+++ /dev/null
@@ -1,62 +0,0 @@
-SUMMARY="A decoding library for BMP and ICO images"
-DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/"
-COPYRIGHT="2006 Richard Wilson
-	2008-2016 Sean Fox"
-LICENSE="MIT"
-REVISION="3"
-SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-$portVersion-src.tar.gz"
-CHECKSUM_SHA256="deff0a0497fc011356f901b3f75ee612721133c91b256dda28e540c803ffbb3e"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	libnsbmp$secondaryArchSuffix = $portVersion
-	lib:libnsbmp$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	libnsbmp${secondaryArchSuffix}_devel = $portVersion
-	devel:libnsbmp$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	libnsbmp$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	netsurf_buildsystem
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	for linkage in lib-static lib-shared; do
-		make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-			COMPONENT_TYPE=$linkage
-	done
-}
-
-INSTALL()
-{
-	for linkage in lib-static lib-shared; do
-		make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-			COMPONENT_TYPE=$linkage \
-			INCLUDEDIR=$relativeIncludeDir install \
-			LIBDIR=$relativeLibDir
-	done
-
-	prepareInstalledDevelLib libnsbmp
-	fixPkgconfig
-
-	# devel package
-	packageEntries devel \
-		$developDir
-}
diff --git a/media-libs/libnsbmp/libnsbmp-0.1.5.recipe b/media-libs/libnsbmp/libnsbmp-0.1.5.recipe
index d1023ba88..2c8806ece 100644
--- a/media-libs/libnsbmp/libnsbmp-0.1.5.recipe
+++ b/media-libs/libnsbmp/libnsbmp-0.1.5.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats"
 HOMEPAGE="https://www.netsurf-browser.org/projects/libnsbmp/"
 COPYRIGHT="2003-2018 The NetSurf Developers"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libnsbmp-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="65cc0d81727e2ece417b7997ba2451309f07a4e5932e52019a20867640152b52"
 
@@ -23,7 +23,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libnsbmp${secondaryArchSuffix}_devel = $portVersion
-	devel:libnsbmp$secondaryArchSuffix = $libVersionCompat
+	devel:libnsbmp$secondaryArchSuffix = $libVersion compat = $libVersionCompat
 	"
 REQUIRES_devel="
 	libnsbmp$secondaryArchSuffix == $portVersion base
diff --git a/media-libs/libnsgif/libnsgif-0.1.4.recipe b/media-libs/libnsgif/libnsgif-0.1.4.recipe
deleted file mode 100644
index 876e28408..000000000
--- a/media-libs/libnsgif/libnsgif-0.1.4.recipe
+++ /dev/null
@@ -1,62 +0,0 @@
-SUMMARY="A decoding library for GIF images"
-DESCRIPTION="Libnsgif is a decoding library for GIF image file format"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/"
-COPYRIGHT="2006 Richard Wilson
-	2008-2016 Sean Fox"
-LICENSE="MIT"
-REVISION="2"
-SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnsgif-$portVersion-src.tar.gz"
-CHECKSUM_SHA256="133c2354c61564080ad1bac253ee0df7e6c82bb6090644ca438ce3a799f6bad1"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	libnsgif$secondaryArchSuffix = $portVersion
-	lib:libnsgif$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	libnsgif${secondaryArchSuffix}_devel = $portVersion
-	devel:libnsgif$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	libnsgif$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	netsurf_buildsystem
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	for linkage in lib-static lib-shared; do
-		make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-			COMPONENT_TYPE=$linkage
-	done
-}
-
-INSTALL()
-{
-	for linkage in lib-static lib-shared; do
-		make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-			COMPONENT_TYPE=$linkage \
-			INCLUDEDIR=$relativeIncludeDir install \
-			LIBDIR=$relativeLibDir
-	done
-
-	prepareInstalledDevelLib libnsgif
-	fixPkgconfig
-
-	# devel package
-	packageEntries devel \
-		$developDir
-}
diff --git a/media-libs/libnsgif/libnsgif-0.2.1.recipe b/media-libs/libnsgif/libnsgif-0.2.1.recipe
index bfa4c16ce..7e11d5570 100644
--- a/media-libs/libnsgif/libnsgif-0.2.1.recipe
+++ b/media-libs/libnsgif/libnsgif-0.2.1.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="Libnsgif is a decoding library for GIF image file format"
 HOMEPAGE="https://www.netsurf-browser.org/projects/libnsgif/"
 COPYRIGHT="2003-2018 The NetSurf Developers"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libnsgif-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="9eaea534cd70b53c5aaf45317ae957701685a6b4a88dbe34ed26f4faae879a4b"
 if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
@@ -26,7 +26,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libnsgif${secondaryArchSuffix}_devel = $portVersion
-	devel:libnsgif$secondaryArchSuffix = $libVersionCompat
+	devel:libnsgif$secondaryArchSuffix = $libVersion compat = $libVersionCompat
 	"
 REQUIRES_devel="
 	libnsgif$secondaryArchSuffix == $portVersion base
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.7.recipe b/media-libs/libsvgtiny/libsvgtiny-0.1.7.recipe
index c20b208ef..b69c2d8cb 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.7.recipe
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.7.recipe
@@ -5,7 +5,7 @@ library does not do the actual rendering."
 HOMEPAGE="https://www.netsurf-browser.org/projects/libsvgtiny/"
 COPYRIGHT="2003-2018 The NetSurf Developers"
 LICENSE="MIT"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libsvgtiny-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="2c0dcf952f1cd882c3e95401ef9459f16dbb53c5d3e4512339b2f9eb769d7781"
 
@@ -30,7 +30,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libsvgtiny${secondaryArchSuffix}_devel = $portVersion
-	devel:libsvgtiny$secondaryArchSuffix = $libVersionCompat
+	devel:libsvgtiny$secondaryArchSuffix = $libVersion compat = $libVersionCompat
 	"
 REQUIRES_devel="
 	libsvgtiny$secondaryArchSuffix == $portVersion base
diff --git a/net-libs/hubbub/hubbub-0.3.5.recipe b/net-libs/hubbub/hubbub-0.3.6.recipe
similarity index 91%
rename from net-libs/hubbub/hubbub-0.3.5.recipe
rename to net-libs/hubbub/hubbub-0.3.6.recipe
index 0262cfc9d..d5ae4aba6 100644
--- a/net-libs/hubbub/hubbub-0.3.5.recipe
+++ b/net-libs/hubbub/hubbub-0.3.6.recipe
@@ -9,12 +9,12 @@ markup, both valid and invalid. As a result, Hubbub parses web content well.
 If you are looking for an HTML5 parser in Python or Ruby, you may wish to \
 look at html5lib."
 HOMEPAGE="https://www.netsurf-browser.org/projects/hubbub/"
-COPYRIGHT="2007-2018 J-M Bell"
+COPYRIGHT="2007-2019 J-M Bell"
 LICENSE="MIT"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libhubbub-$portVersion-src.tar.gz"
-CHECKSUM_SHA256="aa82e36be124e582e307929eee81a42ffaf4355b2986934917271d65d20cd88f"
 SOURCE_DIR="libhubbub-$portVersion"
+CHECKSUM_SHA256="d756c795c1a0e08beec4acd68364ac4477960d62fffa3b60da05f5a7763f7bf4"
 
 ARCHITECTURES="?x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -42,11 +42,11 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	devel:libiconv$secondaryArchSuffix
 	devel:libjson_c$secondaryArchSuffix
-	devel:libparserutils$secondaryArchSuffix
+	devel:libparserutils$secondaryArchSuffix >= 0.2.4
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	netsurf_buildsystem
+	netsurf_buildsystem >= 1.8
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:perl
diff --git a/net-libs/libdom/libdom-0.3.3.recipe b/net-libs/libdom/libdom-0.4.0.recipe
similarity index 85%
rename from net-libs/libdom/libdom-0.3.3.recipe
rename to net-libs/libdom/libdom-0.4.0.recipe
index f509c155e..6be48ba0b 100644
--- a/net-libs/libdom/libdom-0.3.3.recipe
+++ b/net-libs/libdom/libdom-0.4.0.recipe
@@ -1,11 +1,11 @@
 SUMMARY="An implementation of the W3C DOM"
 DESCRIPTION="An implementation of the W3C DOM for NetSurf, written in C."
 HOMEPAGE="https://www.netsurf-browser.org/projects/libdom/"
-COPYRIGHT="2007-2018 J-M Bell"
+COPYRIGHT="2007-2019 J-M Bell"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libdom-$portVersion-src.tar.gz"
-CHECKSUM_SHA256="e06a987d61d0783b81170ddb920d80802a1616aa7f1a7a458c6fd0564f3929a4"
+CHECKSUM_SHA256="9eb9cd308136d5078fd9a342f391ef65071e8660a0ea29d50cb41d37a8c6b3c7"
 
 ARCHITECTURES="?x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -35,18 +35,18 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	netsurf_buildsystem
-	xml_parser
 	devel:libexpat$secondaryArchSuffix
-	devel:libhubbub$secondaryArchSuffix
-	devel:libparserutils$secondaryArchSuffix
-	devel:libwapcaplet$secondaryArchSuffix
+	devel:libhubbub$secondaryArchSuffix >= 0.3.6
+	devel:libparserutils$secondaryArchSuffix >= 0.2.4
+	devel:libwapcaplet$secondaryArchSuffix >= 0.4.2
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
+	netsurf_buildsystem >= 1.8
+	xml_parser
 	"
 
 BUILD()
diff --git a/net-libs/libnspsl/libnspsl-0.1.3.recipe b/net-libs/libnspsl/libnspsl-0.1.5.recipe
similarity index 88%
rename from net-libs/libnspsl/libnspsl-0.1.3.recipe
rename to net-libs/libnspsl/libnspsl-0.1.5.recipe
index 3c3292182..e1ca4363f 100644
--- a/net-libs/libnspsl/libnspsl-0.1.3.recipe
+++ b/net-libs/libnspsl/libnspsl-0.1.5.recipe
@@ -13,14 +13,14 @@ The principal use in a web browser is to restrict supercookies being set,
 although it can also serve secondary purposes in the UI such as domain
 highlighting"
 HOMEPAGE="https://source.netsurf-browser.org/libnspsl.git/"
-COPYRIGHT="2016-2018 Vincent Sanders"
+COPYRIGHT="2016-2019 Vincent Sanders"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libnspsl-$portVersion-src.tar.gz"
-CHECKSUM_SHA256="8de2595a4479cf45e9144594b3736710c21b2ed0c000b45fefaa24a2c40c53e7"
+CHECKSUM_SHA256="cdc54dacc20cfdadb799b8b4a9ffe0a1b62ba39ab060c35d8ae5eceee447386a"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
 
 libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
@@ -43,7 +43,7 @@ REQUIRES_devel="
 
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	netsurf_buildsystem >= 1.6
+	netsurf_buildsystem >= 1.8
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
diff --git a/sys-devel/avr_gcc/avr_gcc-6.4.0.recipe b/sys-devel/avr_gcc/avr_gcc-6.4.0.recipe
new file mode 100644
index 000000000..f5e0a34e4
--- /dev/null
+++ b/sys-devel/avr_gcc/avr_gcc-6.4.0.recipe
@@ -0,0 +1,123 @@
+SUMMARY="C/C++ cross-compiler for Atmel AVR"
+DESCRIPTION="
+Compiler for Atmel AVR platform.
+"
+HOMEPAGE="https://gcc.gnu.org"
+
+SOURCE_URI="http://ftpmirror.gnu.org/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz"
+CHECKSUM_SHA256="850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4"
+SOURCE_DIR="gcc-$portVersion"
+REVISION="1"
+LICENSE="
+	GNU GPL v2
+	GNU LGPL v2
+	"
+COPYRIGHT="1988-2017 Free Software Foundation, Inc."
+
+
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64 ?arm"
+SECONDARY_ARCHITECTURES="x86"
+
+targetArch="avr"
+targetU="avr"
+
+PROVIDES="
+	${targetU}_gcc$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:${targetU}_c++$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:${targetU}_cc$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:${targetU}_cpp$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:${targetU}_g++$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:${targetU}_gcc$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:${targetU}_gcc_4.8.2$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:${targetU}_gcov$secondaryArchSuffix = $portVersion compat >= 4
+	lib:${targetU}_libstdc++$secondaryArchSuffix = $portVersion compat >= 4
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	cmd:${targetU}_as$secondaryArchSuffix
+	lib:libgmp$secondaryArchSuffix
+	lib:libmpfr$secondaryArchSuffix
+	lib:libmpc$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	cmd:${targetU}_as$secondaryArchSuffix
+	devel:libgmp$secondaryArchSuffix
+	devel:libmpfr$secondaryArchSuffix
+	devel:libmpc$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	cmd:autoconf
+	cmd:awk
+	cmd:bison
+	cmd:find
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:makeinfo
+	cmd:sed
+	cmd:strip
+	cmd:tar
+	cmd:xargs
+	"
+
+sourceDir=$(pwd)
+relativeInstallDir="develop/tools/${targetArch}"
+installDir="$prefix/$relativeInstallDir"
+objectsDir=$(pwd)/../${portVersionedName}-obj
+
+BUILD()
+{
+	rm -rf $objectsDir
+
+	# Touch some files generated by bison, so that bison won't run to update
+	# them. Fixes issues with newer bison versions.
+	# And while at it, touch gperf target, too (as gperf may not be installed).
+	(cd $sourceDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \
+		cp/parse.h c-gperf.h)
+
+	mkdir -p $objectsDir
+	cd $objectsDir
+
+	# Setting a quoted string in an environment variable is ugly (the quotes
+	# are removed at various stages and need an absurd amount of escaping), so
+	# let's use a file and --include instead.
+	echo '#define LIBRARY_PATH_ENV "AVR_LIBRARY_PATH"' > haiku_host.h
+
+	CXXFLAGS="-O2 -include $objectsDir/haiku_host.h" \
+	CFLAGS="-O2 -U_FORTIFY_SOURCE" "$sourceDir/configure" \
+		--build=$effectiveTargetMachineTriple \
+		--prefix=$installDir --libexecdir=$installDir/lib --mandir=$manDir \
+		--docdir=$docDir --disable-nls --disable-libssp --with-gnu-ld \
+		--enable-languages=c,c++ --enable-lto --enable-frame-pointer \
+		--enable-multilib --disable-shared \
+		--with-native-system-header-dir=/include \
+		--with-pkgversion=$(echo $portVersion | cut -c 7-) --target=$targetArch
+
+	make $jobArgs all-gcc all-target-libgcc
+}
+
+INSTALL()
+{
+	cd $objectsDir
+
+	make install-gcc install-target-libgcc
+
+	### Symlinks ##############################################
+
+	echo "Creating required symlinks"
+
+	# make all tools available via default paths
+	mkdir -p $binDir
+	for f in c++ cc cpp g++ gcc gcov; do
+		symlinkRelative -sfn $installDir/bin/$targetArch-$f $binDir
+	done
+
+	### Cleanup ###############################################
+
+	echo "Cleanup"
+	rm -rf $installDir/info
+	rm -rf $installDir/share
+}
diff --git a/www-client/netsurf/netsurf-3.8.recipe b/www-client/netsurf/netsurf-3.9.recipe
similarity index 80%
rename from www-client/netsurf/netsurf-3.8.recipe
rename to www-client/netsurf/netsurf-3.9.recipe
index e162859e9..e3ad9f748 100644
--- a/www-client/netsurf/netsurf-3.8.recipe
+++ b/www-client/netsurf/netsurf-3.9.recipe
@@ -8,11 +8,11 @@ features including tabbed browsing, bookmarks and page thumbnailing."
 HOMEPAGE="https://www.netsurf-browser.org/"
 COPYRIGHT="2003-2018 The NetSurf Browser project"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="1"
 # 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="https://download.netsurf-browser.org/netsurf/releases/source/netsurf-$portVersion-src.tar.gz"
-CHECKSUM_SHA256="a00ee6f3e7ea7ae50c6c1f95c81d381359171bf6874e58891f21c550090c5542"
+CHECKSUM_SHA256="d72f1c6f6113a01e541f8476a93c347235068779140090df55ba402eb4a8ecc3"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
@@ -49,24 +49,24 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libcheck$secondaryArchSuffix
-	devel:libcss$secondaryArchSuffix
+	devel:libcss$secondaryArchSuffix >= 0.9.0
 	devel:libcurl$secondaryArchSuffix
-	devel:libdom$secondaryArchSuffix
+	devel:libdom$secondaryArchSuffix >= 0.4.0
 	devel:libexpat$secondaryArchSuffix
-	devel:libhubbub$secondaryArchSuffix
+	devel:libhubbub$secondaryArchSuffix >= 0.3.6
 	devel:libiconv$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
-	devel:libnsbmp$secondaryArchSuffix
-	devel:libnsgif$secondaryArchSuffix
-	devel:libnslog$secondaryArchSuffix
-	devel:libnspsl$secondaryArchSuffix
-	devel:libnsutils$secondaryArchSuffix
-	devel:libparserutils$secondaryArchSuffix
+	devel:libnsbmp$secondaryArchSuffix >= 0.1.5
+	devel:libnsgif$secondaryArchSuffix >= 0.2.1
+	devel:libnslog$secondaryArchSuffix >= 0.1.2
+	devel:libnspsl$secondaryArchSuffix >= 0.1.5
+	devel:libnsutils$secondaryArchSuffix >= 0.0.5
+	devel:libparserutils$secondaryArchSuffix >= 0.2.4
 	devel:libpng16$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
-	devel:libsvgtiny$secondaryArchSuffix
+	devel:libsvgtiny$secondaryArchSuffix >= 0.1.7
 	devel:libutf8proc$secondaryArchSuffix
-	devel:libwapcaplet$secondaryArchSuffix
+	devel:libwapcaplet$secondaryArchSuffix >= 0.4.2
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -79,6 +79,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:nsgenbind
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:xxd
 	"
 
 BUILD()