diff --git a/www/shiori/Makefile b/www/shiori/Makefile
index 081569aabd5a..33a687f338c9 100644
--- a/www/shiori/Makefile
+++ b/www/shiori/Makefile
@@ -1,19 +1,30 @@
 PORTNAME=	shiori
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6.0-rc.1
+DISTVERSION=	1.6.0-rc.4
 CATEGORIES=	www
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Simple bookmark manager built with Go
 WWW=		https://github.com/go-shiori/shiori
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go:modules
+USES=		go:1.21,modules
 
 GO_MODULE=	github.com/go-shiori/shiori
 
 PLIST_FILES=	bin/${PORTNAME}
 
+BUILD_DATE=	%FT%T
+
+# fix `shiori version` output
+post-patch:
+	${REINPLACE_CMD} \
+		-e 's/"dev"/"${DISTVERSION}"/1' \
+		-e 's/"none"/"${OPSYS}"/1' \
+		-e 's/"unknown"/"${BUILD_DATE:gmtime}"/1' \
+		${WRKSRC}/main.go \
+		${WRKSRC}/internal/model/main.go
+
 .include <bsd.port.mk>
diff --git a/www/shiori/distinfo b/www/shiori/distinfo
index 836cc92f96b7..4c874a9ac74d 100644
--- a/www/shiori/distinfo
+++ b/www/shiori/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1694503377
-SHA256 (go/www_shiori/shiori-v1.6.0-rc.1/v1.6.0-rc.1.mod) = e6240837c8c3e3375fdacdade33dccba5af812f2244f151915bea927596ea6dc
-SIZE (go/www_shiori/shiori-v1.6.0-rc.1/v1.6.0-rc.1.mod) = 4561
-SHA256 (go/www_shiori/shiori-v1.6.0-rc.1/v1.6.0-rc.1.zip) = 5304fdc65aceaece9865a647f64659c991c6ebbd39ba601b939d80f3dd69def8
-SIZE (go/www_shiori/shiori-v1.6.0-rc.1/v1.6.0-rc.1.zip) = 6981840
+TIMESTAMP = 1699517557
+SHA256 (go/www_shiori/shiori-v1.6.0-rc.4/v1.6.0-rc.4.mod) = 9408aa9d7835be16771429b0e8905eec4043dba7d7ab058e6c66e4fdd1a61aa6
+SIZE (go/www_shiori/shiori-v1.6.0-rc.4/v1.6.0-rc.4.mod) = 4516
+SHA256 (go/www_shiori/shiori-v1.6.0-rc.4/v1.6.0-rc.4.zip) = a9004fcb51e32146f36eb0e272fc471c5fa1227856455833932d6abf4ff660b6
+SIZE (go/www_shiori/shiori-v1.6.0-rc.4/v1.6.0-rc.4.zip) = 7009464