diff --git a/common/shlibs b/common/shlibs
index 066b71aa5b9..bdde41594a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -959,3 +959,10 @@ libsystemd-journal.so.0 	systemd-libs		systemd-devel
 libsystemd-login.so.0 		systemd-libs		systemd-devel
 libplist.so.1			libplist		libplist-devel
 libplist++.so.1			libplist++		libplist-devel
+libnsbmp.so.0			libnsbmp		libnsbmp-devel
+libnsgif.so.0			libnsgif		libnsgif-devel
+libparserutils.so.0		libparserutils		libparserutils-devel
+libwapcaplet.so.0		libwapcaplet		libwapcaplet-devel
+libcss.so.0			libcss			libcss-devel
+libhubbub.so.0			libhubbub		libhubbub-devel
+libdom.so.0			libdom			libdom-devel
diff --git a/srcpkgs/libcss-devel b/srcpkgs/libcss-devel
new file mode 120000
index 00000000000..f97cea8fc36
--- /dev/null
+++ b/srcpkgs/libcss-devel
@@ -0,0 +1 @@
+libcss
\ No newline at end of file
diff --git a/srcpkgs/libcss/depends b/srcpkgs/libcss/depends
new file mode 100644
index 00000000000..56fb9e056a7
--- /dev/null
+++ b/srcpkgs/libcss/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.1.1"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libcss/libcss-devel.template b/srcpkgs/libcss/libcss-devel.template
new file mode 100644
index 00000000000..f931c3d7ade
--- /dev/null
+++ b/srcpkgs/libcss/libcss-devel.template
@@ -0,0 +1,15 @@
+# Template file for 'libcss-devel'.
+#
+revision=1
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libcss
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
+}
diff --git a/srcpkgs/libcss/libcss.rshlibs b/srcpkgs/libcss/libcss.rshlibs
new file mode 100644
index 00000000000..2b2a01e2bf3
--- /dev/null
+++ b/srcpkgs/libcss/libcss.rshlibs
@@ -0,0 +1,3 @@
+libparserutils.so.0
+libwapcaplet.so.0
+libc.so.6
diff --git a/srcpkgs/libcss/template b/srcpkgs/libcss/template
new file mode 100644
index 00000000000..9ab5b58496f
--- /dev/null
+++ b/srcpkgs/libcss/template
@@ -0,0 +1,45 @@
+# Template build file for 'libcss'.
+pkgname=libcss
+version=0.1.1
+revision=1
+homepage="http://www.netsurf-browser.org"
+distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz"
+short_desc="CSS parser and selection engine, written in C."
+maintainer="davehome <davehome@redthumb.info.tm>"
+checksum=383c424c1f7134be67e22a7a633e31d47ba6b87aba835a4e73eca893aa01c0a0
+license="MIT"
+long_desc="
+ LibCSS is a CSS (Cascading Style Sheet) parser and selection engine,
+ written in C. It was developed as part of the NetSurf project and is
+ available for use by other software under the MIT licence. For further
+ details, see the readme.
+
+ * Features
+ 	Parses CSS, good and bad
+ 	Simple C API
+ 	Low memory usage
+ 	Fast selection engine
+ 	Portable
+ 	Shared library"
+
+subpackages="${pkgname}-devel"
+
+Add_dependency build sed
+Add_dependency build pkg-config
+Add_dependency build perl
+Add_dependency build libparserutils-devel 
+Add_dependency build libwapcaplet-devel
+
+do_build() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared
+	make ${makejobs} COMPONENT_TYPE=lib-static
+}
+
+do_install() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+	make ${makejobs} COMPONENT_TYPE=lib-static \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+
+	vinstall "${wrksrc}/COPYING" 0644 "usr/share/licenses/${pkgname}"
+}
diff --git a/srcpkgs/libdom-devel b/srcpkgs/libdom-devel
new file mode 120000
index 00000000000..7a4d19a9f6f
--- /dev/null
+++ b/srcpkgs/libdom-devel
@@ -0,0 +1 @@
+libdom
\ No newline at end of file
diff --git a/srcpkgs/libdom/libdom-devel.template b/srcpkgs/libdom/libdom-devel.template
new file mode 100644
index 00000000000..1ce61d69375
--- /dev/null
+++ b/srcpkgs/libdom/libdom-devel.template
@@ -0,0 +1,14 @@
+# Template file for 'libdom-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libdom
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
+}
diff --git a/srcpkgs/libdom/libdom.rshlibs b/srcpkgs/libdom/libdom.rshlibs
new file mode 100644
index 00000000000..1ba7d36222a
--- /dev/null
+++ b/srcpkgs/libdom/libdom.rshlibs
@@ -0,0 +1,5 @@
+libparserutils.so.0
+libwapcaplet.so.0
+libxml2.so.2
+libhubbub.so.0
+libc.so.6
diff --git a/srcpkgs/libdom/template b/srcpkgs/libdom/template
new file mode 100644
index 00000000000..d24134f2c22
--- /dev/null
+++ b/srcpkgs/libdom/template
@@ -0,0 +1,46 @@
+# Template build file for 'libdom'.
+pkgname=libdom
+version="$(date -u +%Y%m%d)"
+homepage="http://www.netsurf-browser.org"
+short_desc="Implementation of the W3C DOM, written in C."
+maintainer="davehome <davehome@redthumb.info.tm>"
+license="MIT"
+long_desc="
+ LibDOM is an implementation of the W3C DOM, written in C. It is
+ currently in development for use with NetSurf and is intended to
+ be suitable for use in other projects too. For further details,
+ see the readme."
+
+subpackages="${pkgname}-devel"
+
+nofetch=yes
+noextract=yes
+
+Add_dependency build sed
+Add_dependency build pkg-config
+Add_dependency build perl
+Add_dependency build subversion
+Add_dependency build libxml2-devel
+Add_dependency build libparserutils-devel
+Add_dependency build libwapcaplet-devel
+Add_dependency build libhubbub-devel
+
+do_fetch() {
+	local url="svn://svn.netsurf-browser.org/trunk/libdom"
+	msg_normal " Fetching source from $url ...\n"
+	svn co ${url} ${pkgname}-${version}
+}
+
+do_build() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared
+	make ${makejobs} COMPONENT_TYPE=lib-static
+}
+
+do_install() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+	make ${makejobs} COMPONENT_TYPE=lib-static \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+
+	vinstall "${wrksrc}/COPYING" 644 "usr/share/license/${pkgname}"
+}
diff --git a/srcpkgs/libhubbub-devel b/srcpkgs/libhubbub-devel
new file mode 120000
index 00000000000..a298af8da53
--- /dev/null
+++ b/srcpkgs/libhubbub-devel
@@ -0,0 +1 @@
+libhubbub
\ No newline at end of file
diff --git a/srcpkgs/libhubbub/depends b/srcpkgs/libhubbub/depends
new file mode 100644
index 00000000000..56fb9e056a7
--- /dev/null
+++ b/srcpkgs/libhubbub/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.1.1"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libhubbub/libhubbub-devel.template b/srcpkgs/libhubbub/libhubbub-devel.template
new file mode 100644
index 00000000000..a31330b6aa0
--- /dev/null
+++ b/srcpkgs/libhubbub/libhubbub-devel.template
@@ -0,0 +1,15 @@
+# Template file for 'libhubbub-devel'.
+#
+revision=1
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libhubbub
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
+}
diff --git a/srcpkgs/libhubbub/libhubbub.rshlibs b/srcpkgs/libhubbub/libhubbub.rshlibs
new file mode 100644
index 00000000000..c9ad5d604b3
--- /dev/null
+++ b/srcpkgs/libhubbub/libhubbub.rshlibs
@@ -0,0 +1,2 @@
+libparserutils.so.0
+libc.so.6
diff --git a/srcpkgs/libhubbub/template b/srcpkgs/libhubbub/template
new file mode 100644
index 00000000000..581c2038670
--- /dev/null
+++ b/srcpkgs/libhubbub/template
@@ -0,0 +1,53 @@
+# Template build file for 'libhubbub'.
+pkgname=libhubbub
+version=0.1.1
+revision=1
+homepage="http://www.netsurf-browser.org"
+distfiles="${homepage}/projects/releases/hubbub-${version}-src.tar.gz"
+short_desc="HTML5 compliant parsing library, written in C."
+maintainer="davehome <davehome@redthumb.info.tm>"
+checksum=363f1acf1ca3b3362bb84fc8ed9544b2207e7cb706ac176477ad00dc0d56782b
+license="MIT"
+long_desc="
+ Hubbub is an HTML5 compliant parsing library, written in C. It was
+ developed as part of the NetSurf project and is available for use
+ by other software under the MIT licence.
+
+ The HTML5 specification defines a parsing algorithm, based on the
+ behaviour of mainstream browsers, which provides instructions for
+ how to parse all markup, both valid and invalid. As a result, Hubbub
+ parses web content well.
+
+ * Features
+ 	Parses HTML, good and bad
+ 	Simple C API
+ 	Fast
+ 	Character encoding detection
+ 	Well-tested (~90% test coverage)
+ 	Portable
+ 	Shared library"
+
+subpackages="${pkgname}-devel"
+
+Add_dependency build sed
+Add_dependency build perl
+Add_dependency build pkg-config
+Add_dependency build libxslt-devel
+Add_dependency build json-c-devel
+Add_dependency build libparserutils-devel
+
+wrksrc=hubbub-${version}
+
+do_build() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared
+	make ${makejobs} COMPONENT_TYPE=lib-static
+}
+
+do_install() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+	make ${makejobs} COMPONENT_TYPE=lib-static \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+
+	vinstall "${wrksrc}/COPYING" 0644 "usr/share/licenses/${pkgname}"
+}
diff --git a/srcpkgs/libnsbmp-devel b/srcpkgs/libnsbmp-devel
new file mode 120000
index 00000000000..4be7d867219
--- /dev/null
+++ b/srcpkgs/libnsbmp-devel
@@ -0,0 +1 @@
+libnsbmp
\ No newline at end of file
diff --git a/srcpkgs/libnsbmp/depends b/srcpkgs/libnsbmp/depends
new file mode 100644
index 00000000000..12f980f59d1
--- /dev/null
+++ b/srcpkgs/libnsbmp/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.0.3"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libnsbmp/libnsbmp-devel.template b/srcpkgs/libnsbmp/libnsbmp-devel.template
new file mode 100644
index 00000000000..534b1df1a37
--- /dev/null
+++ b/srcpkgs/libnsbmp/libnsbmp-devel.template
@@ -0,0 +1,15 @@
+# Template file for 'libnsbmp-devel'.
+#
+revision=2
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libnsbmp
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
+}
diff --git a/srcpkgs/libnsbmp/libnsbmp.rshlibs b/srcpkgs/libnsbmp/libnsbmp.rshlibs
new file mode 100644
index 00000000000..631aa1dda40
--- /dev/null
+++ b/srcpkgs/libnsbmp/libnsbmp.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libnsbmp/template b/srcpkgs/libnsbmp/template
new file mode 100644
index 00000000000..4f9da1e1243
--- /dev/null
+++ b/srcpkgs/libnsbmp/template
@@ -0,0 +1,38 @@
+# Template build file for 'libnsbmp'.
+pkgname=libnsbmp
+version=0.0.3
+revision=2
+homepage="http://www.netsurf-browser.org"
+distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz"
+short_desc="Decoding library for BMP and ICO images in C."
+maintainer="davehome <davehome@redthumb.info.tm>"
+checksum=e0ccf851bf6dc9398b587f1b3f919773a49d7d2eb082b99ab5898217d73e47a2
+license="MIT"
+long_desc="
+ libnsbmp is a decoding library for BMP and ICO image file formats, written
+ in C. It was developed as part of the NetSurf project and is available for
+ use by other software under the MIT licence.
+
+ * Features
+ 	Decodes BMP files
+ 	Decodes ICO files"
+
+subpackages="${pkgname}-devel"
+
+wrksrc=${pkgname}-${version}-src
+
+Add_dependency build sed
+
+do_build() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared
+	make ${makejobs} COMPONENT_TYPE=lib-static
+}
+
+do_install() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared \
+		DESTDIR=${DESTDIR} PREFIX=/usr install
+	make ${makejobs} COMPONENT_TYPE=lib-static \
+		DESTDIR=${DESTDIR} PREFIX=/usr install
+
+	vinstall "${wrksrc}/COPYING" 0644 "usr/share/licenses/${pkgname}"
+}
diff --git a/srcpkgs/libnsgif-devel b/srcpkgs/libnsgif-devel
new file mode 120000
index 00000000000..acaa2be89f7
--- /dev/null
+++ b/srcpkgs/libnsgif-devel
@@ -0,0 +1 @@
+libnsgif
\ No newline at end of file
diff --git a/srcpkgs/libnsgif/depends b/srcpkgs/libnsgif/depends
new file mode 100644
index 00000000000..12f980f59d1
--- /dev/null
+++ b/srcpkgs/libnsgif/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.0.3"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libnsgif/libnsgif-devel.template b/srcpkgs/libnsgif/libnsgif-devel.template
new file mode 100644
index 00000000000..8618293454a
--- /dev/null
+++ b/srcpkgs/libnsgif/libnsgif-devel.template
@@ -0,0 +1,15 @@
+# Template file for 'libnsgif-devel'.
+#
+revision=2
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libnsgif
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
+}
diff --git a/srcpkgs/libnsgif/libnsgif.rshlibs b/srcpkgs/libnsgif/libnsgif.rshlibs
new file mode 100644
index 00000000000..631aa1dda40
--- /dev/null
+++ b/srcpkgs/libnsgif/libnsgif.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libnsgif/template b/srcpkgs/libnsgif/template
new file mode 100644
index 00000000000..9d9d6783b38
--- /dev/null
+++ b/srcpkgs/libnsgif/template
@@ -0,0 +1,37 @@
+# Template build file for 'libnsgif'.
+pkgname=libnsgif
+version=0.0.3
+revision=2
+homepage="http://www.netsurf-browser.org"
+distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz"
+short_desc="Decoding library for the GIF image file format, written in C."
+maintainer="davehome <davehome@redthumb.info.tm>"
+checksum=1f53bb6cc449c3b108d7653ce876ec58745f184d5a6675a95f1fa8c937dfc6d5
+license="MIT"
+long_desc="
+ libnsgif is a decoding library for the GIF image file format, written
+ in C. It was developed as part of the NetSurf project and is available
+ for use by other software under the MIT licence.
+
+ * Features
+ 	Decodes GIF files"
+
+subpackages="${pkgname}-devel"
+
+wrksrc=${pkgname}-${version}-src
+
+Add_dependency build sed
+
+do_build() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared
+	make ${makejobs} COMPONENT_TYPE=lib-static
+}
+
+do_install() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared \
+		DESTDIR=${DESTDIR} PREFIX=/usr install
+	make ${makejobs} COMPONENT_TYPE=lib-static \
+		DESTDIR=${DESTDIR} PREFIX=/usr install
+
+	vinstall "${wrksrc}/COPYING" 0644 "usr/share/licenses/${pkgname}"
+}
diff --git a/srcpkgs/libparserutils-devel b/srcpkgs/libparserutils-devel
new file mode 120000
index 00000000000..76bd945de12
--- /dev/null
+++ b/srcpkgs/libparserutils-devel
@@ -0,0 +1 @@
+libparserutils
\ No newline at end of file
diff --git a/srcpkgs/libparserutils/depends b/srcpkgs/libparserutils/depends
new file mode 100644
index 00000000000..56fb9e056a7
--- /dev/null
+++ b/srcpkgs/libparserutils/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.1.1"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libparserutils/libparserutils-devel.template b/srcpkgs/libparserutils/libparserutils-devel.template
new file mode 100644
index 00000000000..7c2ca876006
--- /dev/null
+++ b/srcpkgs/libparserutils/libparserutils-devel.template
@@ -0,0 +1,16 @@
+# Template file for 'libparserutils-devel'.
+#
+revision=2
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libparserutils
+
+do_install() {
+
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
+}
diff --git a/srcpkgs/libparserutils/libparserutils.rshlibs b/srcpkgs/libparserutils/libparserutils.rshlibs
new file mode 100644
index 00000000000..631aa1dda40
--- /dev/null
+++ b/srcpkgs/libparserutils/libparserutils.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libparserutils/template b/srcpkgs/libparserutils/template
new file mode 100644
index 00000000000..96b5fca453a
--- /dev/null
+++ b/srcpkgs/libparserutils/template
@@ -0,0 +1,45 @@
+# Template build file for 'libnsgif'.
+pkgname=libparserutils
+version=0.1.1
+revision=2
+homepage="http://www.netsurf-browser.org"
+distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz"
+short_desc="Library for building efficient parsers, written in C."
+maintainer="davehome <davehome@redthumb.info.tm>"
+checksum=8b79ba58d6fa63fa9c74b71482d93f2c5b2c22badac77265f3cc47f3f603f87d
+license="MIT"
+long_desc="
+ LibParserUtils is a library for building efficient parsers, written
+ in C. It was developed as part of the NetSurf project and is available
+ for use by other software under the MIT licence.
+
+ * Features
+ 	No mandatory dependencies (iconv() implementation optional for
+ 		enhanced charset support)
+ 	A number of built-in character set converters
+ 	Mapping of character set names to/from MIB enum values
+ 	UTF-8 and UTF-16 (host endian) support functions
+ 	Various simple data structures (resizeable buffer, stack, vector)
+ 	A UTF-8 input stream
+ 	Simple C API
+ 	Portable
+ 	Shared library"
+
+subpackages="${pkgname}-devel"
+
+Add_dependency build sed
+Add_dependency build perl
+
+do_build() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared
+	make ${makejobs} COMPONENT_TYPE=lib-static
+}
+
+do_install() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+	make ${makejobs} COMPONENT_TYPE=lib-static \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+
+	vinstall "${wrksrc}/COPYING" 0644 "usr/share/license/${pkgname}"
+}
diff --git a/srcpkgs/libwapcaplet-devel b/srcpkgs/libwapcaplet-devel
new file mode 120000
index 00000000000..c12e300eeec
--- /dev/null
+++ b/srcpkgs/libwapcaplet-devel
@@ -0,0 +1 @@
+libwapcaplet
\ No newline at end of file
diff --git a/srcpkgs/libwapcaplet/depends b/srcpkgs/libwapcaplet/depends
new file mode 100644
index 00000000000..140f5aa7a9d
--- /dev/null
+++ b/srcpkgs/libwapcaplet/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.1.0"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libwapcaplet/libwapcaplet-devel.template b/srcpkgs/libwapcaplet/libwapcaplet-devel.template
new file mode 100644
index 00000000000..453c738f3bd
--- /dev/null
+++ b/srcpkgs/libwapcaplet/libwapcaplet-devel.template
@@ -0,0 +1,15 @@
+# Template file for 'libwapcaplet-devel'.
+#
+revision=1
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libwapcaplet
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
+}
diff --git a/srcpkgs/libwapcaplet/libwapcaplet.rshlibs b/srcpkgs/libwapcaplet/libwapcaplet.rshlibs
new file mode 100644
index 00000000000..631aa1dda40
--- /dev/null
+++ b/srcpkgs/libwapcaplet/libwapcaplet.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libwapcaplet/template b/srcpkgs/libwapcaplet/template
new file mode 100644
index 00000000000..65ae6bf12b9
--- /dev/null
+++ b/srcpkgs/libwapcaplet/template
@@ -0,0 +1,36 @@
+# Template build file for 'libwapcaplet'.
+pkgname=libwapcaplet
+version=0.1.0
+revision=1
+homepage="http://www.netsurf-browser.org"
+distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz"
+short_desc="String internment library, written in C"
+maintainer="davehome <davehome@redthumb.info.tm>"
+checksum=e58df9d4ee18344946d5c7c17fb99f29269027dafd875e2fe10bb1fb9d7fc1a7
+license="MIT"
+long_desc="
+ LibWapcaplet is a string internment library, written in C. It provides
+ reference counted string interment and rapid string comparison
+ functionality. It was developed as part of the NetSurf project and is
+ available for use by other software under the MIT licence. For further
+ details, see the readme."
+
+subpackages="${pkgname}-devel"
+
+Add_dependency build sed
+
+wrksrc=${pkgname}-${version}-src
+
+do_build() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared
+	make ${makejobs} COMPONENT_TYPE=lib-static
+}
+
+do_install() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+	make ${makejobs} COMPONENT_TYPE=lib-static \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+
+	vinstall "${wrksrc}/COPYING" 0644 "usr/share/licenses/${pkgname}"
+}
diff --git a/srcpkgs/netsurf/files/netsurf.desktop b/srcpkgs/netsurf/files/netsurf.desktop
new file mode 100644
index 00000000000..fcc39c4e80d
--- /dev/null
+++ b/srcpkgs/netsurf/files/netsurf.desktop
@@ -0,0 +1,127 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Netsurf
+Name[ar]=صافي تصفح
+Name[ast]=Netsurf
+Name[ca]=Netsurf
+Name[cs]=Netsurf
+Name[da]=Netsurf
+Name[de]=Netsurf
+Name[el]=καθαρού σερφ
+Name[en_GB]=Netsurf
+Name[es]=Netsurf
+Name[et]=Netsurf
+Name[fi]=Netsurf
+Name[fr]=Netsurf
+Name[gl]=Netsurf
+Name[he]=Netsurf
+Name[hr]=Netsurf
+Name[hu]=Netsurf
+Name[id]=Netsurf
+Name[it]=Netsurf
+Name[ja]=Netsurf
+Name[ko]=인터넷 서핑
+Name[lt]=Netsurf
+Name[nl]=Netsurf
+Name[no]=Netsurf
+Name[pl]=Netsurf
+Name[pt]=Netsurf
+Name[pt_BR]=Netsurf
+Name[ro]=Netsurf
+Name[ru]=Netsurf
+Name[sk]=Netsurf
+Name[sr]=нетсурф
+Name[sr@latin]=Netsurf
+Name[sv]=Netsurf
+Name[tr]=Netsurf
+Name[ug]=Netsurf
+Name[uk]=Інтернет серфінгу
+Name[zh_CN]=Netsurf 网冲浪
+Name[zh_TW]=Netsurf 網衝浪
+GenericName=Web Browser
+GenericName[ar]=متصفح الوب
+GenericName[ast]=Restolador
+GenericName[ca]=Navegador web
+GenericName[cs]=Internetový prohlížeč
+GenericName[da]=Webbrowser
+GenericName[de]=Internetbetrachter
+GenericName[el]=Περιηγητής Ιστού
+GenericName[en_GB]=Web Browser
+GenericName[es]=Navegador web
+GenericName[et]=Veebibrauser
+GenericName[fi]=Verkkoselain
+GenericName[fr]=Navigateur Internet
+GenericName[gl]=Navegador web
+GenericName[he]=דפדפן
+GenericName[hr]=Web preglednik
+GenericName[hu]=Webböngésző
+GenericName[id]=Peramban Web
+GenericName[it]=Browser web
+GenericName[ja]=ウェブブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[lt]=Interneto naršyklė
+GenericName[nl]=Webbrowser
+GenericName[no]=Nettleser
+GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ
+GenericName[pl]=Przeglądarka internetowa
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador web
+GenericName[ro]=Navigator web
+GenericName[ru]=Интернет-обозреватель
+GenericName[sk]=Internetový prehliadač
+GenericName[sr]=Интернет прегледник
+GenericName[sr@latin]=Internet preglednik
+GenericName[sv]=Webbläsare
+GenericName[tr]=Web Tarayıcı
+GenericName[ug]=توركۆرگۈ
+GenericName[uk]=Переглядач Веб
+GenericName[zh_CN]=网页浏览器
+GenericName[zh_TW]=網頁瀏覽器
+Comment=Lightweight web browser
+Comment[ar]=منصفح الوب الخفيف
+Comment[ast]=Restolador llixeru
+Comment[ca]=Navegador web lleuger
+Comment[cs]=Odlehčený prohlížeč
+Comment[da]=Letvægtig webbrowser
+Comment[de]=Schlanker Internetbetrachter
+Comment[el]=Ελαφρύς περιηγητής ιστού
+Comment[en_GB]=Lightweight web browser
+Comment[es]=Navegador web ligero
+Comment[et]=Kergekaaluline veebibrauser
+Comment[fi]=Kevyt verkkoselain
+Comment[fr]=Navigateur Internet léger
+Comment[gl]=Navegador web lixeiro
+Comment[he]=דפדפן קל משקל
+Comment[hr]=Lagani web preglednik
+Comment[hu]=Könnyűsúlyú webböngésző
+Comment[id]=Peramban web ringan
+Comment[it]=Browser web leggero
+Comment[ja]=軽量級ウェブブラウザ
+Comment[ko]=가벼운 웹 브라우저
+Comment[lt]=Paprasta interneto naršyklė
+Comment[nl]=Lichtgewicht webbrowser
+Comment[no]=Lettvektig nettleser
+Comment[pa]=ਲਾਈਟਵੇਟ ਵੈੱਬ ਬਰਾਊਜ਼ਰ
+Comment[pl]=Umożliwia przeglądanie zawartości sieci internetowej
+Comment[pt]=Navegador Web rápido
+Comment[pt_BR]=Navegador web leve
+Comment[ro]=Mic navigator web
+Comment[ru]=Легковесный Интернет-обозреватель
+Comment[sk]=Ľahký internetový prehliadač
+Comment[sr]=Једноставан Интернет прегледник
+Comment[sr@latin]=Jednostavan Internet preglednik
+Comment[sv]=Resurssnål webbläsare
+Comment[tr]=Hafif web tarayıcı
+Comment[ug]=يېنىك توركۆرگۈ
+Comment[uk]=Легкий переглядач Веб
+Comment[zh_CN]=轻量级网页浏览器
+Comment[zh_TW]=輕量級網頁瀏覽器
+Categories=GTK;Network;WebBrowser;
+MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo;
+Exec=netsurf %U
+Icon=netsurf
+Terminal=false
+StartupNotify=true
+X-Osso-Type=application/x-executable
+X-Osso-Service=netsurf
diff --git a/srcpkgs/netsurf/files/netsurf.png b/srcpkgs/netsurf/files/netsurf.png
new file mode 100644
index 00000000000..c6526d8b161
Binary files /dev/null and b/srcpkgs/netsurf/files/netsurf.png differ
diff --git a/srcpkgs/netsurf/netsurf.rshlibs b/srcpkgs/netsurf/netsurf.rshlibs
new file mode 100644
index 00000000000..beb7081f8f7
--- /dev/null
+++ b/srcpkgs/netsurf/netsurf.rshlibs
@@ -0,0 +1,28 @@
+libjpeg.so.8
+libmng.so.1
+libz.so.1
+libxml2.so.2
+libcurl.so.4
+libhubbub.so.0
+libcss.so.0
+libparserutils.so.0
+libwapcaplet.so.0
+libssl.so.1
+libcrypto.so.1
+librsvg-2.so.2
+libm.so.6
+libgdk_pixbuf-2.0.so.0
+libcairo.so.2
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libnsbmp.so.0
+libnsgif.so.0
+libpng14.so.14
+libwebp.so.2
+libglade-2.0.so.0
+libgtk-x11-2.0.so.0
+libgdk-x11-2.0.so.0
+libpangocairo-1.0.so.0
+libpango-1.0.so.0
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
new file mode 100644
index 00000000000..91acadb6c1a
--- /dev/null
+++ b/srcpkgs/netsurf/template
@@ -0,0 +1,81 @@
+# Template build file for 'netsurf'.
+pkgname=netsurf
+version=2.8
+revision=2
+homepage="http://www.netsurf-browser.org"
+distfiles="${homepage}/downloads/releases/${pkgname}-${version}-full-src.tar.gz"
+short_desc="Free, open source web browser written in C."
+maintainer="davehome <davehome@redthumb.info.tm>"
+license="GPL-2, MIT"
+checksum=2055d52764faed054892670101fc95c1bf0bddc2370495250192f1855117b718
+long_desc="
+ Small as a mouse, fast as a cheetah and available for free. NetSurf is
+ a multi-platform web browser for RISC OS, UNIX-like platforms (including
+ Linux), Mac OS X, and more.
+
+ Written in C, this award winning open source project features its own
+ layout engine. It is licensed under GPL version 2.
+
+ * Web standards: HTML 4.01 and CSS 2.1
+ * Image formats: PNG, GIF, JPEG, SVG, JNG, MNG and BMP
+ * HTTPS for secure online transactions
+ * Unicode text
+ * Web page thumbnailing
+ * Local history trees
+ * Global history
+ * Hotlist manager (bookmarks)
+ * Cookie manager
+ * URL completion
+ * Text selection
+ * Scale view
+ * Search-as-you-type text search highlighting
+ * Save pages complete with images
+ * Fast, lightweight layout and rendering engine"
+
+gtk_iconcache_dirs="/usr/share/pixmaps"
+
+Add_dependency build sed
+Add_dependency build pkg-config
+Add_dependency build perl
+Add_dependency build jpeg-devel
+Add_dependency build libmng-devel
+Add_dependency build libpng-devel
+Add_dependency build librsvg-devel
+Add_dependency build libxml2-devel
+Add_dependency build libcurl-devel
+Add_dependency build lcms-devel
+Add_dependency build libwebp-devel
+Add_dependency build libparserutils-devel
+Add_dependency build libwapcaplet-devel
+Add_dependency build libhubbub-devel
+Add_dependency build libcss-devel
+Add_dependency build libnsbmp-devel
+Add_dependency build libnsgif-devel
+Add_dependency build gtk+-devel
+Add_dependency build libglade-devel
+
+Add_dependency full desktop-file-utils
+Add_dependency full shared-mime-info
+
+do_build() {
+	make ${makejobs} --directory=${pkgname}-${version} \
+		PREFIX=/usr TARGET=gtk NETSURF_USE_WEBP=YES
+}
+
+do_install() {
+	make ${makejobs} --directory=${pkgname}-${version} \
+		PREFIX=/usr DESTDIR=${DESTDIR} TARGET=gtk \
+		NETSURF_USE_WEBP=YES install
+
+	# Install app icon (from Ubuntu)
+	vinstall "${FILESDIR}/${pkgname}.png" \
+		0644 usr/share/pixmaps
+
+	# Install .desktop file (from Arch)
+	vinstall "${FILESDIR}/${pkgname}.desktop" \
+		0644 usr/share/applications
+
+	# Install license
+	vinstall "${wrksrc}/${pkgname}-${version}/COPYING" \
+		0644 "/usr/share/licenses/${pkgname}"
+}
diff --git a/srcpkgs/wine-unstable/libwine-unstable.template b/srcpkgs/wine-unstable/libwine-unstable.template
index 2ee780cf573..b9c13a47c4e 100644
--- a/srcpkgs/wine-unstable/libwine-unstable.template
+++ b/srcpkgs/wine-unstable/libwine-unstable.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains the wine runtime."
 
 only_for_archs=i686
-replaces="libwine>=0"
+replaces="libwine>=0 libwine-unstable>=1.4-rc4"
 provides="libwine-$version"
 conflicts="libwine>=0"
 
diff --git a/srcpkgs/wine-unstable/template b/srcpkgs/wine-unstable/template
index b7c9cdfe3c6..4f8c04d33a5 100644
--- a/srcpkgs/wine-unstable/template
+++ b/srcpkgs/wine-unstable/template
@@ -1,12 +1,15 @@
 # Template file for 'wine-unstable'
 __pkgname=wine
 pkgname=${__pkgname}-unstable
-version=1.4-rc4
-wrksrc=${__pkgname}-$version
+__majminver=1.4
+__rcver=rc4
+__otherversion=${__majminver}-${__rcver}
+version=${__majminver}.${__rcver}
+wrksrc=${__pkgname}-${__otherversion}
 build_style=gnu-configure
 configure_args="--with-x"
 homepage="http://www.winehq.org/"
-distfiles="http://ibiblio.org/pub/linux/system/emulators/${__pkgname}/${__pkgname}-${version}.tar.bz2"
+distfiles="http://ibiblio.org/pub/linux/system/emulators/${__pkgname}/${__pkgname}-${__otherversion}.tar.bz2"
 short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X. (unstable)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
@@ -18,7 +21,7 @@ long_desc="
 
 only_for_archs=i686
 build_requires=11
-replaces="wine>=0"
+replaces="wine>=0 wine-unstable>=1.4-rc4"
 provides="wine-$version"
 conflicts="wine>=0"
 subpackages="lib$pkgname $pkgname-devel"
diff --git a/srcpkgs/wine-unstable/wine-unstable-devel.template b/srcpkgs/wine-unstable/wine-unstable-devel.template
index 456ca4b891a..e70d7a7cab9 100644
--- a/srcpkgs/wine-unstable/wine-unstable-devel.template
+++ b/srcpkgs/wine-unstable/wine-unstable-devel.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains files for development, headers, static libs, etc."
 
 only_for_archs=i686
-replaces="wine-devel>=0"
+replaces="wine-devel>=0 wine-unstable-devel>=1.4-rc4"
 provides="wine-devel-$version"
 conflicts="wine-devel>=0"