diff --git a/devel/samurai/Makefile b/devel/samurai/Makefile
index 51342461cfee..3b993a2ecd38 100644
--- a/devel/samurai/Makefile
+++ b/devel/samurai/Makefile
@@ -1,19 +1,22 @@
 
 PORTNAME=	samurai
-DISTVERSION=	1.2
+DISTVERSION=	1.2-9
+DISTVERSIONSUFFIX=	-g27dde2e
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/michaelforney/samurai/releases/download/${DISTVERSION}/
+#MASTER_SITES=	https://github.com/michaelforney/samurai/releases/download/${DISTVERSION}/
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Ninja-compatible build tool written in C
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	michaelforney
 ALL_TARGET=	samu
 PLIST_FILES=	bin/samu \
 		share/man/man1/samu.1.gz
 
 .include <bsd.port.mk>
diff --git a/devel/samurai/distinfo b/devel/samurai/distinfo
index 0a5fc38bf5c2..20a30f2f117b 100644
--- a/devel/samurai/distinfo
+++ b/devel/samurai/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614177408
-SHA256 (samurai-1.2.tar.gz) = 3b8cf51548dfc49b7efe035e191ff5e1963ebc4fe8f6064a5eefc5343eaf78a5
-SIZE (samurai-1.2.tar.gz) = 32709
+TIMESTAMP = 1617529134
+SHA256 (michaelforney-samurai-1.2-9-g27dde2e_GH0.tar.gz) = 10035b9d39241db4bc48095ed318895b5e427d8d62ae39871b165619e5068338
+SIZE (michaelforney-samurai-1.2-9-g27dde2e_GH0.tar.gz) = 32285diff --git a/sysutils/fluxengine/Makefile b/sysutils/fluxengine/Makefile