diff --git a/net-libs/hubbub/hubbub-0.3.4.recipe b/net-libs/hubbub/hubbub-0.3.5.recipe
similarity index 56%
rename from net-libs/hubbub/hubbub-0.3.4.recipe
rename to net-libs/hubbub/hubbub-0.3.5.recipe
index 73150317c..894e7a65f 100644
--- a/net-libs/hubbub/hubbub-0.3.4.recipe
+++ b/net-libs/hubbub/hubbub-0.3.5.recipe
@@ -8,20 +8,23 @@ of mainstream browsers, which provides instructions for how to parse all \
 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="http://www.netsurf-browser.org/projects/hubbub/"
-COPYRIGHT="2007-2017 J-M Bell"
+HOMEPAGE="https://www.netsurf-browser.org/projects/hubbub/"
+COPYRIGHT="2007-2018 J-M Bell"
 LICENSE="MIT"
 REVISION="1"
-SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libhubbub-$portVersion-src.tar.gz"
-CHECKSUM_SHA256="e3f7e5cac0a14bf7de87782f3f6579d7e226be85de38e190ffc9e686362411ea"
+SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libhubbub-$portVersion-src.tar.gz"
+CHECKSUM_SHA256="aa82e36be124e582e307929eee81a42ffaf4355b2986934917271d65d20cd88f"
 SOURCE_DIR="libhubbub-$portVersion"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	hubbub$secondaryArchSuffix = $portVersion
-	lib:libhubbub$secondaryArchSuffix = $portVersion compat >= 0
+	lib:libhubbub$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -29,7 +32,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	hubbub${secondaryArchSuffix}_devel = $portVersion
-	devel:libhubbub$secondaryArchSuffix = $portVersion compat >= 0
+	devel:libhubbub$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	hubbub$secondaryArchSuffix == $portVersion base
@@ -42,7 +45,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	netsurf_buildsystem >= 1.6
+	netsurf_buildsystem
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:perl
@@ -51,26 +54,30 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
-	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-		COMPONENT_TYPE=lib-shared
+	for linkage in lib-static lib-shared; do
+		make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \
+			COMPONENT_TYPE=$linkage
+	done
 }
 
 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
+	for linkage in lib-static lib-shared; do
+		make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \
+			INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir \
+			COMPONENT_TYPE=$linkage \
+			install
+	done
 
 	prepareInstalledDevelLib libhubbub
 	fixPkgconfig
-	packageEntries devel $developDir
+
+	packageEntries devel \
+		"$developDir"
 }
 
 TEST()
 {
-	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+	make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \
 		LDFLAGS="-liconv -lparserutils" test
 }