diff --git a/shells/carapace/Makefile b/shells/carapace/Makefile
index 3b0bad63084d..4c32cf8131ee 100644
--- a/shells/carapace/Makefile
+++ b/shells/carapace/Makefile
@@ -1,33 +1,32 @@
 PORTNAME=	carapace
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.5.7
-PORTREVISION=	1
+DISTVERSION=	1.6.1
 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
 
 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/...
+	${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 afa7024fb05b..cced581dc615 100644
--- a/shells/carapace/distinfo
+++ b/shells/carapace/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1765418688
-SHA256 (go/shells_carapace/carapace-v1.5.7/v1.5.7.mod) = e0565826d56e952e2602faa9085f14035cfdc15313c5ea9511518981e3f3463b
-SIZE (go/shells_carapace/carapace-v1.5.7/v1.5.7.mod) = 829
-SHA256 (go/shells_carapace/carapace-v1.5.7/v1.5.7.zip) = 3d5125385af15e70793424f6c8cf5bae2cddd91850b2b4661359e08a4d480e43
-SIZE (go/shells_carapace/carapace-v1.5.7/v1.5.7.zip) = 22557098
+TIMESTAMP = 1770098470
+SHA256 (go/shells_carapace/carapace-v1.6.1/v1.6.1.mod) = 14f31797e34d24d2a08ad74b60a867cb6c305e2ca6fa6182161bc7da44fe44bb
+SIZE (go/shells_carapace/carapace-v1.6.1/v1.6.1.mod) = 782
+SHA256 (go/shells_carapace/carapace-v1.6.1/v1.6.1.zip) = 1e21db4c9d2e5b3084272adb57eada6eb16e9f89affdd73ed970f768d8a09231
+SIZE (go/shells_carapace/carapace-v1.6.1/v1.6.1.zip) = 24949487