diff --git a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe b/dev-libs/libparserutils/libparserutils-0.2.0.recipe
similarity index 51%
rename from dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
rename to dev-libs/libparserutils/libparserutils-0.2.0.recipe
index 0ee101344..9ecaa06cf 100644
--- a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
+++ b/dev-libs/libparserutils/libparserutils-0.2.0.recipe
@@ -1,13 +1,13 @@
-#TODO:split out _devel
 SUMMARY="A library for building efficient parsers" 
 DESCRIPTION="
 LibParserUtils is a library for building efficient parsers.
 " 
 HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/" 
-SRC_URI="git://git.netsurf-browser.org/libparserutils.git"
+SRC_URI="http://download.netsurf-browser.org/libs/releases/libparserutils-0.2.0-src.tar.gz"
+CHECKSUM_SHA256="55c50abbffaaebe17acba43008ee2c4085401ce618e505fafa7c75baaa813da7"
 REVISION="1"
 LICENSE="MIT"
-COPYRIGHT="2007 - 2013 J-M Bell"
+COPYRIGHT="2007-2014 J-M Bell"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -15,7 +15,6 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 PROVIDES="
 	libparserutils$secondaryArchSuffix = $portVersion
 	lib:libparserutils$secondaryArchSuffix = $portVersion
-	devel:libparserutils$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES="
@@ -26,7 +25,9 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libiconv${secondaryArchSuffix}
-	netsurf_buildsystem >= 0
+	netsurf_buildsystem >= 1.1
+
+	lib:libiconv${secondaryArchSuffix}
 	"
 
 BUILD_PREREQUIRES="
@@ -36,17 +37,39 @@ BUILD_PREREQUIRES="
 	cmd:perl
 	"
 
+PATCHES="libparserutils-0.2.0.patchset"
 
 BUILD()
 {
+	# Build the static lib
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
+	# Build the shared lib
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		COMPONENT_TYPE=lib-shared
 }
 
 INSTALL()
 {
 	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-		I=/develop/headers/libparserutils
+		INCLUDEDIR=$relativeIncludeDir
+	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		INCLUDEDIR=$relativeIncludeDir COMPONENT_TYPE=lib-shared
+
 	mkdir -p $prefix/develop/lib
-	mv -f $prefix/lib/*.a $prefix/develop/lib/
-	mv -f $prefix/lib/pkgconfig $prefix/develop/lib/
+
+	prepareInstalledDevelLib libparserutils
+	fixPkgconfig libparserutils
+
+	packageEntries devel $developDir
 }
+
+TEST()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		LDFLAGS=-liconv test
+}
+
+PROVIDES_devel="
+	libparserutils${secondaryArchSuffix}_devel = $portVersion
+	devel:libparserutils$secondaryArchSuffix = $portVersion
+"
diff --git a/dev-libs/libparserutils/patches/libparserutils-0.2.0.patchset b/dev-libs/libparserutils/patches/libparserutils-0.2.0.patchset
new file mode 100644
index 000000000..2761f5236
--- /dev/null
+++ b/dev-libs/libparserutils/patches/libparserutils-0.2.0.patchset
@@ -0,0 +1,50 @@
+From 40b2c1f916c450195884c7db57bbea9155e297fc Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 8 Jun 2014 18:39:53 +0200
+Subject: Fix include directories for Haiku.
+
+
+diff --git a/Makefile b/Makefile
+index 5acdc36..14b8325 100644
+--- a/Makefile
++++ b/Makefile
+@@ -33,19 +33,19 @@ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
+ Is := include/parserutils
+-I := /include/parserutils
++I := /$(INCLUDEDIR)/parserutils
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/errors.h;$(Is)/functypes.h;$(Is)/parserutils.h;$(Is)/types.h
+ 
+ Is := include/parserutils/charset
+-I := /include/parserutils/charset
++I := /$(INCLUDEDIR)/parserutils/charset
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/codec.h;$(Is)/mibenum.h;$(Is)/utf16.h;$(Is)/utf8.h
+ 
+ Is := include/parserutils/input
+-I := /include/parserutils/input
++I := /$(INCLUDEDIR)/parserutils/input
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/inputstream.h
+ 
+ Is := include/parserutils/utils
+-I := /include/parserutils/utils
++I := /$(INCLUDEDIR)/parserutils/utils
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/buffer.h;$(Is)/stack.h;$(Is)/vector.h
+ 
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
+diff --git a/libparserutils.pc.in b/libparserutils.pc.in
+index 307e909..1a46cf8 100644
+--- a/libparserutils.pc.in
++++ b/libparserutils.pc.in
+@@ -1,7 +1,7 @@
+ prefix=PREFIX
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/LIBDIR
+-includedir=${prefix}/include
++includedir=${prefix}/INCLUDEDIR
+ 
+ Name: libparserutils
+ Description: Utility library for facilitating parser development
+-- 
+1.8.3.4
+