diff --git a/dev-libs/libcss/libcss-0.4.0.recipe b/dev-libs/libcss/libcss-0.4.0.recipe
index ecbf54a6a..c840bd60e 100644
--- a/dev-libs/libcss/libcss-0.4.0.recipe
+++ b/dev-libs/libcss/libcss-0.4.0.recipe
@@ -2,16 +2,17 @@ SUMMARY="A CSS parser and selection engine"
 DESCRIPTION="
 LibCSS is a CSS (Cascading Style Sheet) parser and selection engine.
 " 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" 
+HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
+COPYRIGHT="2007-2014 J-M Bell"
+LICENSE="MIT"
 SRC_URI="http://download.netsurf-browser.org/libs/releases/libcss-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="0be9509d9d352abdeec87764c1f8ba13950d9dc4f63acade0477209b7fd21748"
 REVISION="2"
-LICENSE="MIT"
-COPYRIGHT="2007-2014 J-M Bell"
-
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+PATCHES="libcss-0.3.0.patchset"
+
 PROVIDES="
 	libcss$secondaryArchSuffix = $portVersion
 	lib:libcss$secondaryArchSuffix = $portVersion
@@ -27,8 +28,6 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libparserutils${secondaryArchSuffix} >= 0.2.0
 	devel:libwapcaplet${secondaryArchSuffix} >= 0.2.1
-	netsurf_buildsystem >= 1.2
-
 	devel:libiconv
 	"
 
@@ -38,9 +37,9 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
+	netsurf_buildsystem >= 1.2
 	"
 
-PATCHES="libcss-0.3.0.patchset"
 BUILD()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
@@ -55,6 +54,8 @@ INSTALL()
 
 	prepareInstalledDevelLib libcss
 	fixPkgconfig
+	
+	# devel package
 	packageEntries devel $developDir
 }
 
@@ -64,6 +65,8 @@ TEST()
 		LDFLAGS="-liconv -lwapcaplet -lparserutils"
 }
 
+# ----- devel package -------------------------------------------------------
+
 PROVIDES_devel="
 	libcss${secondaryArchSuffix}_devel = $portVersion
 	devel:libcss$secondaryArchSuffix = $portVersion
diff --git a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.2.recipe b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.2.recipe
index d9f1fddf8..f5dbcdb6a 100644
--- a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.2.recipe
+++ b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.2.recipe
@@ -3,13 +3,13 @@ DESCRIPTION="
 NetSurf build framework for compiling some of their libraries.
 "
 HOMEPAGE="http://git.netsurf-browser.org/buildsystem.git/"
-SRC_URI="http://download.netsurf-browser.org/libs/releases/buildsystem-1.2.tar.gz"
+SRC_URI="http://download.netsurf-browser.org/libs/releases/buildsystem-$portVersion.tar.gz"
 CHECKSUM_SHA256="3903a4a1551c9c202e1d2047344c4f3598c8d9d6c35ebf8cc2e18874bd0c9d61"
 REVISION="1"
 LICENSE="MIT"
 COPYRIGHT="2009-2014 The NetSurf Browser project"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
@@ -30,7 +30,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="buildsystem-1.2"
+SOURCE_DIR="buildsystem-$portVersion"
 PATCHES="netsurf_buildsystem-1.1.patchset"
 BUILD()
 {
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe b/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe
index 218334622..7cd2469e4 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe
@@ -5,30 +5,36 @@ list of paths and texts which can be rendered easily. The library does not do \
 the actual rendering.
 "
 HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny"
+COPYRIGHT="2003-2014 The NetSurf Developers"
+LICENSE="MIT"
 SRC_URI="http://download.netsurf-browser.org/libs/releases/libsvgtiny-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="a5ad4ba467e2ba10ac13fb881937655c5d0ef8e9582ede6a2c73447c87d06e90"
 REVISION="1"
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="libsvgtiny-0.1.1.patchset"
+
 PROVIDES="
 	libsvgtiny = $portVersion
 "
+REQUIRES="
+	haiku >= $haikuVersion
+"
 BUILD_REQUIRES="
 	devel:libwapcaplet
 	devel:libdom
 	devel:libhubbub
 	devel:libparserutils
-	netsurf_buildsystem
 "
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	netsurf_buildsystem
 	cmd:gcc
-	gperf
+	cmd:gperf
 	cmd:make
 	cmd:pkg_config
 "
 
-PATCHES="libsvgtiny-0.1.1.patchset"
-
 BUILD()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
@@ -42,12 +48,17 @@ INSTALL()
 
 	prepareInstalledDevelLib libsvgtiny
 	fixPkgconfig
+	
+	# devel package
 	packageEntries devel $developDir
 }
-LICENSE="MIT"
-COPYRIGHT="2003-2014 The NetSurf Developers"
+
+# ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
 	libsvgtiny_devel = $portVersion
 	devel:libsvgtiny = $portVersion
 "
+REQUIRES_devel="
+	libsvgtiny$secondaryArchSuffix == $portVersion base
+"
diff --git a/net-libs/libdom/libdom-0.1.1.recipe b/net-libs/libdom/libdom-0.1.1.recipe
index 069422cc5..4b41e4ea0 100644
--- a/net-libs/libdom/libdom-0.1.1.recipe
+++ b/net-libs/libdom/libdom-0.1.1.recipe
@@ -1,15 +1,24 @@
 SUMMARY="LibDOM is an implementation of the W3C DOM" 
 DESCRIPTION="An implementation of the W3C DOM for NetSurf, written in C."
-HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/" 
+HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
+LICENSE="MIT"
+COPYRIGHT="2007-2014 J-M Bell"
 SRC_URI="http://download.netsurf-browser.org/libs/releases/libdom-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="e86c11e313cdfbbe9674ad14125093240e23a2fa9e6f05b996d6b655e40c2dd4"
 REVISION="1"
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="libdom-$portVersion.patchset"
 
 PROVIDES="
 	libdom = $portVersion
+	lib:libdom = $portVersion
 "
 
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
 BUILD_REQUIRES="
 	devel:libexpat
 	devel:libhubbub
@@ -27,7 +36,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config
 "
 
-PATCHES="libdom-$portVersion.patchset"
 BUILD()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
@@ -48,10 +56,12 @@ TEST()
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test
 }
 
-LICENSE="MIT"
-COPYRIGHT="2007-2014 J-M Bell"
+# ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
 	libdom_devel = $portVersion
 	devel:libdom = $portVersion
 "
+REQUIRES_devel="
+	libdom$secondaryArchSuffix == $portVersion base
+	"