diff --git a/dev-libs/re2/patches/re2-0.2016.05.01.patchset b/dev-libs/re2/patches/re2-2016.05.01.patchset
similarity index 100%
rename from dev-libs/re2/patches/re2-0.2016.05.01.patchset
rename to dev-libs/re2/patches/re2-2016.05.01.patchset
diff --git a/dev-libs/re2/patches/re2-2018.02.01.patchset b/dev-libs/re2/patches/re2-2018.02.01.patchset
new file mode 100644
index 000000000..3f4932492
--- /dev/null
+++ b/dev-libs/re2/patches/re2-2018.02.01.patchset
@@ -0,0 +1,24 @@
+From 6eafa9d127c28dda098a7024fc0a26502a7665ed Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 11 May 2016 19:38:35 +0000
+Subject: Haiku patch
+
+
+diff --git a/Makefile b/Makefile
+index d0e2090..e5a2cff 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,8 +17,8 @@ CXX?=g++
+ CXXFLAGS?=-O3 -g
+ LDFLAGS?=
+ # required
+-RE2_CXXFLAGS?=-std=c++11 -pthread -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -I. $(CCICU) $(CCPCRE)
+-RE2_LDFLAGS?=-pthread $(LDICU) $(LDPCRE)
++RE2_CXXFLAGS?=-std=c++11 -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -I. $(CCICU) $(CCPCRE)
++RE2_LDFLAGS?=$(LDICU) $(LDPCRE)
+ AR?=ar
+ ARFLAGS?=rsc
+ NM?=nm
+-- 
+2.2.2
+
diff --git a/dev-libs/re2/re2-0.2016.05.01.recipe b/dev-libs/re2/re2-2016.05.01.recipe
similarity index 97%
rename from dev-libs/re2/re2-0.2016.05.01.recipe
rename to dev-libs/re2/re2-2016.05.01.recipe
index ca97fda37..13b17ebd5 100644
--- a/dev-libs/re2/re2-0.2016.05.01.recipe
+++ b/dev-libs/re2/re2-2016.05.01.recipe
@@ -3,16 +3,16 @@ DESCRIPTION="RE2 is a fast, safe, thread-friendly alternative to backtracking \
 regular expression engines like those used in PCRE, PERL and Python. It is a \
 C++ library."
 HOMEPAGE="http://github.com/google/re2"
-LICENSE="BSD (3-clause)"
 COPYRIGHT="2009 The RE2 Authors"
+LICENSE="BSD (3-clause)"
+REVISION="2"
 RE_VERSION="${portVersion//./-}"
-RE_VERSION="${RE_VERSION#0-}"
 SOURCE_URI="https://github.com/google/re2/archive/$RE_VERSION.tar.gz"
-SOURCE_FILENAME="re2-$portVersion.tar.gz"
 CHECKSUM_SHA256="d9d13f0ea4e1c6628b1cb85eeee284d4fdd4948da94b1f205096254927092e3d"
+SOURCE_FILENAME="re2-$portVersion.tar.gz"
 SOURCE_DIR="re2-$RE_VERSION"
 PATCHES="re2-$portVersion.patchset"
-REVISION="2"
+
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
@@ -49,7 +49,7 @@ BUILD()
 INSTALL()
 {
 	make prefix=$prefix libdir=$libDir install
-	
+
 	mkdir -p $includeDir
 	mv $prefix/include/* $includeDir
 	rmdir $prefix/include
diff --git a/dev-libs/re2/re2-2018.02.01.recipe b/dev-libs/re2/re2-2018.02.01.recipe
new file mode 100644
index 000000000..1a436d983
--- /dev/null
+++ b/dev-libs/re2/re2-2018.02.01.recipe
@@ -0,0 +1,75 @@
+SUMMARY="A Regular Expression Library"
+DESCRIPTION="RE2 is a fast, safe, thread-friendly alternative to backtracking \
+regular expression engines like those used in PCRE, PERL and Python. It is a \
+C++ library."
+HOMEPAGE="https://github.com/google/re2"
+COPYRIGHT="2009 The RE2 Authors"
+LICENSE="BSD (3-clause)"
+REVISION="1"
+RE_VERSION="${portVersion//./-}"
+SOURCE_URI="https://github.com/google/re2/archive/$RE_VERSION.tar.gz"
+CHECKSUM_SHA256="c8ab833081c9766ef4e4d1e6397044ff3b20e42be109084b50d49c161f876184"
+SOURCE_FILENAME="re2-$portVersion.tar.gz"
+SOURCE_DIR="re2-$RE_VERSION"
+PATCHES="re2-$portVersion.patchset"
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="0.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	re2$secondaryArchSuffix = $portVersion
+	lib:libre2$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	re2${secondaryArchSuffix}_devel = $portVersion
+	devel:libre2$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	re2$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+defineDebugInfoPackage re2$secondaryArchSuffix \
+	$libDir/libre2.so.$libVersion
+
+BUILD()
+{
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make prefix=$prefix libdir=$libDir install
+
+	mkdir -p $includeDir
+	mv $prefix/include/* $includeDir
+	rmdir $prefix/include
+
+	# prepare develop/lib
+	prepareInstalledDevelLibs libre2
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make check
+}