diff --git a/sysutils/gomi/Makefile b/sysutils/gomi/Makefile
index 9e77ffd49371..3c6645586a45 100644
--- a/sysutils/gomi/Makefile
+++ b/sysutils/gomi/Makefile
@@ -1,36 +1,33 @@
 PORTNAME=	gomi
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6.3
-PORTREVISION=	3
+DISTVERSION=	1.6.4
 CATEGORIES=	sysutils
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Unix rm(1) command that can restore deleted files
 WWW=		https://github.com/babarot/gomi
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 
 _BUILD_VERSION=		${DISTVERSIONFULL}
-_BUILD_REVISION=	6215428
-_BUILD_DATE=		$$(date +%Y-%m-%dT%H:%M:%SZ)
+_BUILD_REVISION=	08cdfa5
+_BUILD_DATE=		${HOSTARCH}-portbld-${OPSYS:tl}-${OSREL:R}
 
 GO_MODULE=	github.com/babarot/gomi
-GO_BUILDFLAGS=	-ldflags "\
-		-s -w \
-		-X main.version=${_BUILD_VERSION} \
+GO_LDFLAGS=	-X main.version=${_BUILD_VERSION} \
 		-X main.revision=${_BUILD_REVISION} \
 		-X main.buildDate=${_BUILD_DATE}"
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/gomi/distinfo b/sysutils/gomi/distinfo
index 6e7c0dbf7301..447a7f76c14a 100644
--- a/sysutils/gomi/distinfo
+++ b/sysutils/gomi/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1774029065
-SHA256 (go/sysutils_gomi/gomi-v1.6.3/v1.6.3.mod) = afe91980fe44ca2aa5cd46d113bc5d6937f51f512d9838b96c011a0bf11c32ab
-SIZE (go/sysutils_gomi/gomi-v1.6.3/v1.6.3.mod) = 2550
-SHA256 (go/sysutils_gomi/gomi-v1.6.3/v1.6.3.zip) = a788f6f878edfe927a09d14a8e692eaec02ba16d9a636d64256c7529f40faf19
-SIZE (go/sysutils_gomi/gomi-v1.6.3/v1.6.3.zip) = 4142512
+TIMESTAMP = 1780846478
+SHA256 (go/sysutils_gomi/gomi-v1.6.4/v1.6.4.mod) = 84e58b10e15f741cc7199b9244b1a640d7ede9109e6d72f14dee6a1155b73d25
+SIZE (go/sysutils_gomi/gomi-v1.6.4/v1.6.4.mod) = 2530
+SHA256 (go/sysutils_gomi/gomi-v1.6.4/v1.6.4.zip) = 9bda1b9651305e2f4fca35b87af322f77ba8c825ec59db2fb95d6a8b75cf72b2
+SIZE (go/sysutils_gomi/gomi-v1.6.4/v1.6.4.zip) = 4164629