diff --git a/devel/shfmt/Makefile b/devel/shfmt/Makefile
index 18068bfac78a..183feb50ba60 100644
--- a/devel/shfmt/Makefile
+++ b/devel/shfmt/Makefile
@@ -1,28 +1,27 @@
 PORTNAME=	shfmt
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.5.1
-PORTREVISION=	6
+DISTVERSION=	3.6.0
 CATEGORIES=	devel
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Shell script formatter
 WWW=		https://github.com/mvdan/sh
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	scdoc:textproc/scdoc
 
 USES=		go:modules
 GO_MODULE=	mvdan.cc/sh/v3
 GO_TARGET=	./cmd/shfmt
 GO_BUILDFLAGS=	-ldflags="-s -w -X main.version=${DISTVERSIONFULL}"
 
 PLIST_FILES=	bin/shfmt \
 		man/man1/shfmt.1.gz
 
 post-install:
 	scdoc < ${WRKSRC}/cmd/shfmt/shfmt.1.scd \
 		> ${STAGEDIR}${MAN1PREFIX}/man/man1/shfmt.1
 
 .include <bsd.port.mk>
diff --git a/devel/shfmt/distinfo b/devel/shfmt/distinfo
index f764021909cc..8067d4475023 100644
--- a/devel/shfmt/distinfo
+++ b/devel/shfmt/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1653402787
-SHA256 (go/devel_shfmt/shfmt-v3.5.1/v3.5.1.mod) = d4e6377e714806ec536611f415c037485ceec066a25c96c52f1dd9288e652034
-SIZE (go/devel_shfmt/shfmt-v3.5.1/v3.5.1.mod) = 669
-SHA256 (go/devel_shfmt/shfmt-v3.5.1/v3.5.1.zip) = 3238a633c6c68bebdaf64b80f58304c2e96877789a20fac644f1130ef153a3a0
-SIZE (go/devel_shfmt/shfmt-v3.5.1/v3.5.1.zip) = 229353
+TIMESTAMP = 1670865288
+SHA256 (go/devel_shfmt/shfmt-v3.6.0/v3.6.0.mod) = aad2932b81eb95edb5b9e348f0903db52f93c7a1ca85797bea9798f94772dd04
+SIZE (go/devel_shfmt/shfmt-v3.6.0/v3.6.0.mod) = 481
+SHA256 (go/devel_shfmt/shfmt-v3.6.0/v3.6.0.zip) = f4ed2c5938a88e89c61c89bf7f3533828f24ff62d374e753a2197efab9882796
+SIZE (go/devel_shfmt/shfmt-v3.6.0/v3.6.0.zip) = 244864