diff --git a/haiku-apps/beacon/beacon-27.recipe b/haiku-apps/beacon/beacon-27.recipe
index 2450ea598..98e6cc4a4 100644
--- a/haiku-apps/beacon/beacon-27.recipe
+++ b/haiku-apps/beacon/beacon-27.recipe
@@ -1,22 +1,48 @@
+SUMMARY="A full text indexing and search tool"
 DESCRIPTION="Beacon is a full text indexing and search tool for Haiku"
-HOMEPAGE="http://code.google.com/p/haiku-beacon/"
-SOURCE_URI="svn+http://haiku-beacon.googlecode.com/svn/trunk#27"
+HOMEPAGE="https://github.com/HaikuArchives/Beacon/"
+COPYRIGHT="2009 Haiku Inc"
+LICENSE="MIT"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="CLucene"
-#CHECKSUM_MD5=""
+srcGitRev="b34f3773deff426d091d1395965e3859c761e8fa"
+SOURCE_URI="https://github.com/HaikuArchives/Beacon/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="33a48323a40e761c9f121dc2f201a71df078a5d55bbc1d4036b8f574bd2dc0bf"
+PATCHES="beacon-$portVersion.patchset"
+
+SOURCE_DIR="Beacon-$srcGitRev"
+
+ARCHITECTURES="!x86_gcc2 ?x86_64"
+
+PROVIDES="
+	beacon = $portVersion
+	cmd:index_server
+	cmd:indexutil
+	cmd:searchapp
+	"
+REQUIRES="
+	haiku
+	lib:libclucene_core
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	devel:libclucene_core
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:jam
+	"
 
 BUILD()
 {
-	cd beacon-27
 	jam
 }
 
 INSTALL()
 {
-	cd beacon-27
-	jam
+	mkdir $binDir $appsDir
+	cp src/index_server/index_server $binDir
+	cp src/indexutil/indexutil $binDir
+	cp src/searchapp/searchapp $appsDir/Beacon
 }
-
-LICENSE="MIT"
-COPYRIGHT="2009 Haiku Inc"
diff --git a/haiku-apps/beacon/patches/beacon-27.patchset b/haiku-apps/beacon/patches/beacon-27.patchset
new file mode 100644
index 000000000..9d98bb3b8
--- /dev/null
+++ b/haiku-apps/beacon/patches/beacon-27.patchset
@@ -0,0 +1,22 @@
+From 7f90a731625f1532969ba5a028a4216e9c2a9fe9 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sat, 19 Aug 2017 15:29:22 +0000
+Subject: use the correct clucene lib
+
+
+diff --git a/Jamfile b/Jamfile
+index 4e58d12..7cc27f1 100644
+--- a/Jamfile
++++ b/Jamfile
+@@ -1,7 +1,7 @@
+ # Jamfile in $(TOP)
+ # For now, using a temporary build system to get stuff done.
+ 
+-LINKLIBS = -lbe -lclucene -lstdc++ -ltranslation ;
++LINKLIBS = -lbe -lclucene-core -lstdc++ -ltranslation ;
+ C++FLAGS = -ggdb -DDEBUG ;
+ 
+ SubDir TOP ;
+-- 
+2.13.1
+