diff --git a/dev-libs/oniguruma/oniguruma-5.9.2.recipe b/dev-libs/oniguruma/oniguruma-5.9.2.recipe
deleted file mode 100644
index 305186dc9..000000000
--- a/dev-libs/oniguruma/oniguruma-5.9.2.recipe
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION="a regular expression library for different character encodings"
-HOMEPAGE="http://www.geocities.jp/kosako3/oniguruma/"
-SOURCE_URI="http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.2.tar.gz"
-CHECKSUM_MD5="0f4ad1b100a5f9a91623e04111707b84"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd onig-5.9.2
-	libtoolize --force --copy --install
-	touch NEWS ChangeLog
-	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd onig-5.9.2
-	make install
-}
-
-TEST()
-{
-	cd onig-5.9.2
-	make check
-}
-
-LICENSE="BSD (2-clause)"
-COPYRIGHT="K.Kosako"
diff --git a/dev-libs/oniguruma/oniguruma-6.2.0.recipe b/dev-libs/oniguruma/oniguruma-6.2.0.recipe
new file mode 100644
index 000000000..87c8abb39
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-6.2.0.recipe
@@ -0,0 +1,69 @@
+SUMMARY="A regular expression library"
+DESCRIPTION="Oniguruma is a regular expressions library. \
+The characteristics of this library is that different character encoding \
+for every regular expression object can be specified."
+HOMEPAGE="https://github.com/kkos/oniguruma"
+COPYRIGHT="2016 K.Kosako"
+LICENSE="BSD (2-clause)"
+REVISION="1"
+SOURCE_URI="https://github.com/kkos/oniguruma/archive/v6.2.0.tar.gz"
+CHECKSUM_SHA256="b896e24f9efa2d4250299931561dbdb9f13557869fe6cf0fdf670bf2fc6ffbaa"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	oniguruma$secondaryArchSuffix = $portVersion
+	lib:libonig$secondaryArchSuffix = 4.0.0 compat >= 4
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	oniguruma${secondaryArchSuffix}_devel = $portVersion
+	cmd:onig_config$secondaryArchSuffix = $portVersion
+	devel:libonig$secondaryArchSuffix = 4.0.0 compat >= 4
+	"
+REQUIRES_devel="
+	oniguruma$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:awk
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	touch NEWS ChangeLog
+	autoreconf -vfi
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	rm $libDir/libonig.la
+
+	prepareInstalledDevelLib libonig
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir \
+		$binDir/onig-config
+}
+
+TEST()
+{
+	make check
+}
diff --git a/dev-libs/oniguruma/patches/oniguruma-5.9.2.patch b/dev-libs/oniguruma/patches/oniguruma-5.9.2.patch
deleted file mode 100644
index 95a95e23f..000000000
--- a/dev-libs/oniguruma/patches/oniguruma-5.9.2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur onig-5.9.2/configure.in onig-5.9.2-haiku/configure.in
---- onig-5.9.2/configure.in	2010-01-05 22:48:47.002097152 +0900
-+++ onig-5.9.2-haiku/configure.in	2011-05-06 23:43:40.378535936 +0900
-@@ -38,6 +38,7 @@
- 
- dnl Checks for programs.
- AC_PROG_CC
-+AM_PROG_CC_C_O
- AM_PROG_LIBTOOL
- LTVERSION="2:0:0"
- AC_SUBST(LTVERSION)