diff --git a/devel/samurai/Makefile b/devel/samurai/Makefile
index 04044a4c8118..ba018aff2102 100644
--- a/devel/samurai/Makefile
+++ b/devel/samurai/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	samurai
-DISTVERSION=	1.2-16
-PORTREVISION=	1
-DISTVERSIONSUFFIX=	-gca5a6ba
+DISTVERSION=	1.2-17
+DISTVERSIONSUFFIX=	-${GH_TAGNAME}
 CATEGORIES=	devel
-#MASTER_SITES=	https://github.com/michaelforney/samurai/releases/download/${DISTVERSION}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Ninja-compatible build tool written in C
 WWW=		https://github.com/michaelforney/samurai
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE
 
 USES=		cpe
 CPE_VENDOR=	${PORTNAME}_project
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	michaelforney
+GH_TAGNAME=	217059f
+
 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 1db8b476dfd3..3b80a7c37df9 100644
--- a/devel/samurai/distinfo
+++ b/devel/samurai/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618081793
-SHA256 (michaelforney-samurai-1.2-16-gca5a6ba_GH0.tar.gz) = 238ad1cb171931c8b8a9d1841f1206af3759fd11366cf958ff08faf36c801027
-SIZE (michaelforney-samurai-1.2-16-gca5a6ba_GH0.tar.gz) = 32069
+TIMESTAMP = 1688826100
+SHA256 (michaelforney-samurai-1.2-17-217059f-217059f_GH0.tar.gz) = 6c0c512c5647cdac88eabf483269cf491d816cac94ebdb861647059763c1185e
+SIZE (michaelforney-samurai-1.2-17-217059f-217059f_GH0.tar.gz) = 32697
diff --git a/devel/samurai/files/patch-Makefile b/devel/samurai/files/patch-Makefile
index 0f74b5cab567..9a0e6e677882 100644
--- a/devel/samurai/files/patch-Makefile
+++ b/devel/samurai/files/patch-Makefile
@@ -1,15 +1,15 @@
---- Makefile.orig	2021-04-10 18:44:40 UTC
+--- Makefile.orig	2023-07-08 14:22:22 UTC
 +++ Makefile
 @@ -1,10 +1,10 @@
  .POSIX:
  .PHONY: all install clean
  
 -PREFIX=/usr/local
 +PREFIX?=/usr/local
  BINDIR=$(PREFIX)/bin
  MANDIR=$(PREFIX)/share/man
--ALL_CFLAGS=$(CFLAGS) -std=c99 -Wall -Wextra -Wpedantic -Wno-unused-parameter
-+ALL_CFLAGS=$(CFLAGS) -std=c99 -Wall -Wextra -Wno-unused-parameter
+-ALL_CFLAGS=$(CFLAGS) -std=c99 -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wno-unused-parameter
++ALL_CFLAGS=$(CFLAGS) -std=c99 -Wall -Wextra -Wshadow -Wmissing-prototypes -Wno-unused-parameter
  OBJ=\
  	build.o\
  	deps.o\