diff --git a/net-libs/hubbub/hubbub-0.1.2.recipe b/net-libs/hubbub/hubbub-0.1.2.recipe
deleted file mode 100644
index 46bb76916..000000000
--- a/net-libs/hubbub/hubbub-0.1.2.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="Hubbub is an HTML5 compliant parsing library" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/" 
-SRC_URI="http://download.netsurf-browser.org/libs/releases/hubbub-0.1.2-src.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-
-BUILD()
-{
-	cd hubbub-0.1.2
-	make
-}
-
-INSTALL()
-{
-	cd hubbub-0.1.2
-	make install
-}
-
-LICENSE="MIT
-	GNU GPL v2"
-COPYRIGHT="2003 - 2012 The NetSurf Developers"
diff --git a/net-libs/hubbub/hubbub-0.1.2_HEAD.recipe b/net-libs/hubbub/hubbub-0.1.2_HEAD.recipe
deleted file mode 100644
index 32617af60..000000000
--- a/net-libs/hubbub/hubbub-0.1.2_HEAD.recipe
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION="Hubbub is an HTML5 compliant parsing library" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/" 
-SRC_URI="git://git.netsurf-browser.org/libhubbub.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/buildsystem >= 0
-	dev-libs/libparserutils >= 0.1.1"
-
-BUILD()
-{
-	cd hubbub-0.1.2-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd hubbub-0.1.2-HEAD
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT"
-COPYRIGHT="2003 - 2012 The NetSurf Developers"
diff --git a/net-libs/hubbub/hubbub-0.2.0_HEAD.recipe b/net-libs/hubbub/hubbub-0.2.0_HEAD.recipe
deleted file mode 100644
index 933be4ec9..000000000
--- a/net-libs/hubbub/hubbub-0.2.0_HEAD.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="Hubbub is an HTML5 compliant parsing library" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/" 
-SRC_URI="git://git.netsurf-browser.org/libhubbub.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPENDS="dev-util/buildsystem >= 0.0.1"
-
-BUILD()
-{
-	cd hubbub-0.2.0-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd hubbub-0.2.0-HEAD
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT"
-COPYRIGHT="2007 - 2013 J-M Bell"
diff --git a/net-libs/hubbub/libhubbub-0.3.0.recipe b/net-libs/hubbub/libhubbub-0.3.0.recipe
new file mode 100644
index 000000000..52ec185f6
--- /dev/null
+++ b/net-libs/hubbub/libhubbub-0.3.0.recipe
@@ -0,0 +1,73 @@
+SUMMARY="Hubbub is an HTML5 compliant parsing library" 
+DESCRIPTION="
+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.
+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/" 
+SRC_URI="http://download.netsurf-browser.org/libs/releases/libhubbub-0.3.0-src.tar.gz"
+CHECKSUM_SHA256="dbf3b55bf2531d2a8e70f370a9b396cc78bfd5a092f87beb10b05c04fd7cdaa7"
+REVISION="1"
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	libhubbub = $portVersion
+	lib:libhubbub = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	netsurf_buildsystem >= 0.3.0
+	devel:libparserutils
+
+	devel:libjson_c
+	devel:libiconv
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:make
+	cmd:perl
+	cmd:pkg_config
+	"
+
+PATCHES="libhubbub-0.3.0.patchset"
+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
+	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		INCLUDEDIR=$relativeIncludeDir COMPONENT_TYPE=lib-shared
+
+	prepareInstalledDevelLib libhubbub
+	packageEntries devel $developDir
+}
+
+TEST()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		LDFLAGS="-liconv -lparserutils" test
+}
+
+LICENSE="MIT"
+COPYRIGHT="2007-2014 J-M Bell"
+
+PROVIDES_devel="
+	libhubbub_devel = $portVersion
+	devel:libhubbub = $portVersion
+"
diff --git a/net-libs/hubbub/patches/libhubbub-0.3.0.patchset b/net-libs/hubbub/patches/libhubbub-0.3.0.patchset
new file mode 100644
index 000000000..367ef2575
--- /dev/null
+++ b/net-libs/hubbub/patches/libhubbub-0.3.0.patchset
@@ -0,0 +1,47 @@
+From 977b947e2c464a1df18bdccaef261b0c7776406a Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 8 Jun 2014 21:43:33 +0200
+Subject: Fix include dirs for Haiku.
+
+
+diff --git a/Makefile b/Makefile
+index 4ec03f3..f6bfff2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -47,9 +47,9 @@ ifeq ($(WANT_TEST),yes)
+   # We require the presence of libjson -- http://oss.metaparadigm.com/json-c/
+   ifneq ($(PKGCONFIG),)
+     TESTCFLAGS := $(TESTCFLAGS) \
+-		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags json)
++		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags json-c)
+     TESTLDFLAGS := $(TESTLDFLAGS) \
+-		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs json)
++		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs json-c)
+   else
+     TESTCFLAGS := $(TESTCFLAGS) -I$(PREFIX)/include/json
+     TESTLDFLAGS := $(TESTLDFLAGS) -ljson
+@@ -61,7 +61,7 @@ ifeq ($(WANT_TEST),yes)
+ endif
+ 
+ # Extra installation rules
+-I := /include/hubbub
++I := /$(INCLUDEDIR)/hubbub
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/errors.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/functypes.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/hubbub.h
+diff --git a/libhubbub.pc.in b/libhubbub.pc.in
+index 2f9565e..b20a4a0 100644
+--- a/libhubbub.pc.in
++++ b/libhubbub.pc.in
+@@ -1,7 +1,7 @@
+ prefix=PREFIX
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/LIBDIR
+-includedir=${prefix}/include
++includedir=${prefix}/INCLUDEDIR
+ 
+ Name: libhubbub
+ Description: HTML5 parsing library
+-- 
+1.8.3.4
+