diff --git a/dev-libs/libunistring/libunistring-0.9.4.recipe b/dev-libs/libunistring/libunistring-0.9.4.recipe
deleted file mode 100644
index e1459bfe4..000000000
--- a/dev-libs/libunistring/libunistring-0.9.4.recipe
+++ /dev/null
@@ -1,61 +0,0 @@
-SUMMARY="A library for manipulating Unicode strings"
-DESCRIPTION="libunistring provides functions for manipulating Unicode strings and for \
-manipulating C strings according to the Unicode standard."
-HOMEPAGE="http://www.gnu.org/software/libunistring/" 
-SRC_URI="http://ftp.gnu.org/gnu/libunistring/libunistring-0.9.4.tar.gz"
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="1998-2014 Free Software Fundation, Inc."
-CHECKSUM_SHA256="f5246d63286a42902dc096d6d44541fbe4204b6c02d6d5d28b457c9882ddd8a6"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-
-PROVIDES="
-	libunistring
-	lib:libunistring
-	"
-
-REQUIRES="
-	haiku
-	cmd:gperf
-	"
-
-BUILD_REQUIRES=""
-
-BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:make
-	cmd:libtoolize
-	cmd:git
-	cmd:autoconf
-	cmd:gcc
-	cmd:gperf
-	"
-
-PATCH()
-{
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac
-}
-
-BUILD()
-{
-	libtoolize --copy --force --install
-	./autogen.sh
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-	prepareInstalledDevelLib libunistring
-	packageEntries devel \
-		$developDir
-}
-
-# ----- Development package -----
-
-PROVIDES_devel="
-	libunistring_devel
-	devel:libunistring
-	"
-REQUIRES_devel=""
diff --git a/dev-libs/libunistring/libunistring-0.9.5.recipe b/dev-libs/libunistring/libunistring-0.9.5.recipe
new file mode 100644
index 000000000..8186a726e
--- /dev/null
+++ b/dev-libs/libunistring/libunistring-0.9.5.recipe
@@ -0,0 +1,59 @@
+SUMMARY="A library for manipulating Unicode strings"
+DESCRIPTION="libunistring provides functions for manipulating Unicode strings and for \
+manipulating C strings according to the Unicode standard."
+HOMEPAGE="http://www.gnu.org/software/libunistring/" 
+SRC_URI="http://ftp.gnu.org/gnu/libunistring/libunistring-$portVersion.tar.gz"
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="1998-2014 Free Software Fundation, Inc."
+CHECKSUM_SHA256="1a8c0772467850bef7197318a95f44abbb678ea83cbf119a3500cc7848276a17"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PATCHES="libunistring-$portVersion.patchset"
+
+PROVIDES="
+	libunistring$secondaryArchSuffix = $portVersion compat >= 0
+	lib:libunistring$secondaryArchSuffix = 2.0.0 compat >= 2
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES=""
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	cmd:make
+	cmd:libtoolize
+	cmd:git
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:gperf
+	"
+
+BUILD()
+{
+	autoreconf -fi
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	prepareInstalledDevelLib libunistring
+	packageEntries devel \
+		$developDir
+}
+
+# ----- Development package -----
+
+PROVIDES_devel="
+	libunistring${secondaryArchSuffix}_devel = $portVersion
+	devel:libunistring$secondaryArchSuffix = 2.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	libunistring$secondaryArchSuffix == $portVersion base
+	"
diff --git a/dev-libs/libunistring/patches/libunistring-0.9.5.patchset b/dev-libs/libunistring/patches/libunistring-0.9.5.patchset
new file mode 100644
index 000000000..ca2a91c07
--- /dev/null
+++ b/dev-libs/libunistring/patches/libunistring-0.9.5.patchset
@@ -0,0 +1,44 @@
+From 9688eae82d1c9cf4e3c7d7460f7fcba935438029 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 5 Mar 2015 19:33:40 +0000
+Subject: Haiku patch
+
+
+diff --git a/configure.ac b/configure.ac
+index 38fe5dd..5a822de 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([build-aux])
+ . $srcdir/version.sh
+ gl_INIT_PACKAGE([libunistring], [$VERSION_NUMBER])
+ AM_INIT_AUTOMAKE([silent-rules dist-xz])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ dnl Override automake's tar command used for creating distributions.
+ am__tar='${AMTAR} chof - --owner=root --group=root "$$tardir"'
+diff --git a/lib/uniname/uniname.c b/lib/uniname/uniname.c
+index 2191f09..fc2727c 100644
+--- a/lib/uniname/uniname.c
++++ b/lib/uniname/uniname.c
+@@ -375,6 +375,8 @@ unicode_name_character (const char *name)
+       if (false)
+       filled_buf:
+         {
++          uint16_t words[UNICODE_CHARNAME_MAX_WORDS];
++          uint16_t *wordptr = words;
+           {
+             /* Special case for variation selector aliases. Keeps the
+                tables small.  */
+@@ -407,8 +409,6 @@ unicode_name_character (const char *name)
+               }
+           }
+           /* Convert the constituents to uint16_t words.  */
+-          uint16_t words[UNICODE_CHARNAME_MAX_WORDS];
+-          uint16_t *wordptr = words;
+           {
+             const char *p1 = buf;
+             for (;;)
+-- 
+1.8.3.4
+