diff --git a/dev-util/re2c/re2c-0.16.recipe b/dev-util/re2c/re2c-2.0.3.recipe
similarity index 70%
rename from dev-util/re2c/re2c-0.16.recipe
rename to dev-util/re2c/re2c-2.0.3.recipe
index 284304468..3bf78a98d 100644
--- a/dev-util/re2c/re2c-0.16.recipe
+++ b/dev-util/re2c/re2c-2.0.3.recipe
@@ -1,14 +1,15 @@
 SUMMARY="Tool for generating recognizers from regular expressions"
-DESCRIPTION="re2c is a lexer generator for C/C++. Unlike full-featured \
+DESCRIPTION="re2c is a lexer generator for C/C++ and Go. Unlike full-featured \
 table-based lexers, re2c generates code that is believed to be as good \
 (and fast) as a carefully tuned hand-crafted C/C++ lexer."
 HOMEPAGE="http://re2c.org/"
 COPYRIGHT="2003-2016 Peter Bumbulis, Brian Young, Dan Nuffer, Marcus Boerger, \
 Hartmut Kaiser, Emmanuel Mogenet, Ulya Trofimovich"
 LICENSE="Public Domain"
-REVISION="2"
-SOURCE_URI="https://github.com/skvadrik/re2c/releases/download/$portVersion/re2c-$portVersion.tar.gz"
-CHECKSUM_SHA256="48c12564297641cceb5ff05aead57f28118db6277f31e2262437feba89069e84"
+REVISION="1"
+SOURCE_URI="https://github.com/skvadrik/re2c/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="f131b3d5b618454caa5f2ddcc8288b797c78781056a40c2899c832493827c003"
+SOURCE_FILENAME="re2c-$portVersion.tar.gz"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
@@ -24,6 +25,7 @@ fi
 PROVIDES="
 	re2c$secondaryArchSuffix = $portVersion
 	cmd:re2c$commandSuffix = $portVersion
+	cmd:re2go$commandSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -33,14 +35,17 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
 	cmd:autoconf
-	cmd:awk
+	cmd:automake
 	cmd:g++$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	"
 
 BUILD()
 {
+	./autogen.sh
 	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
 	make $jobArgs
 }
@@ -52,5 +57,5 @@ INSTALL()
 
 TEST()
 {
-	make check
+	make tests
 }