diff --git a/shells/carapace/Makefile b/shells/carapace/Makefile
index 7b349cb9da74..052a67fc0143 100644
--- a/shells/carapace/Makefile
+++ b/shells/carapace/Makefile
@@ -1,33 +1,32 @@
 PORTNAME=	carapace
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6.3
-PORTREVISION=	1
+DISTVERSION=	1.6.4
 CATEGORIES=	shells
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Multi-shell multi-command argument completer
 WWW=		https://carapace.sh/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go:modules
+USES=		go:1.25+,modules
 
 GO_MODULE=	github.com/carapace-sh/carapace-bin
 GO_TARGET=	./cmd/carapace
 GO_BUILDFLAGS=	-ldflags "-s -w -X main.version=${DISTVERSION}"
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 pre-build:
 	cd ${GO_WRKSRC} && \
 	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} generate ./cmd/...
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/shells/carapace/distinfo b/shells/carapace/distinfo
index a8ca63cf47c4..22162d50062b 100644
--- a/shells/carapace/distinfo
+++ b/shells/carapace/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1771981250
-SHA256 (go/shells_carapace/carapace-v1.6.3/v1.6.3.mod) = 67f065dd431cce78e6a3146abcea95c9ffdfcfabafb349f2fa81e04c84dbfe2d
-SIZE (go/shells_carapace/carapace-v1.6.3/v1.6.3.mod) = 782
-SHA256 (go/shells_carapace/carapace-v1.6.3/v1.6.3.zip) = c2ee3b2e30ec473110d97bbd14e33ececb366a63251c07c96fd5239e45b695f3
-SIZE (go/shells_carapace/carapace-v1.6.3/v1.6.3.zip) = 25535228
+TIMESTAMP = 1773972135
+SHA256 (go/shells_carapace/carapace-v1.6.4/v1.6.4.mod) = 6964b9dd199e82a3532819c3cc64a1f8aa4e6a84c0d1b78477c956070202b5e8
+SIZE (go/shells_carapace/carapace-v1.6.4/v1.6.4.mod) = 782
+SHA256 (go/shells_carapace/carapace-v1.6.4/v1.6.4.zip) = 609a0114e2690947da0e10628ed6f429917df8b5c596c8e20a3ec0c90b397c58
+SIZE (go/shells_carapace/carapace-v1.6.4/v1.6.4.zip) = 25755498