diff --git a/sysutils/nerdctl/Makefile b/sysutils/nerdctl/Makefile
index 4908cf87b8b1..8675959d1fce 100644
--- a/sysutils/nerdctl/Makefile
+++ b/sysutils/nerdctl/Makefile
@@ -1,50 +1,52 @@
 PORTNAME=	nerdctl
-DISTVERSIONPREFIX=v
-DISTVERSION=	2.1.3
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.1.6
 CATEGORIES=	sysutils
 
 MAINTAINER=	laurent.chardon@gmail.com
 COMMENT=	Docker-compatible CLI for containerd
 WWW=		https://github.com/containerd/nerdctl
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go:1.23,modules
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	containerd
-GH_PROJECT=	${PORTNAME}
-GO_MOD_DIST=	github
+USES=		go:1.24,modules
 
 GO_MODULE=	github.com/containerd/nerdctl/v2
 GO_TARGET=	./cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "-s -w -X ${GO_MODULE}/pkg/version.Version=${DISTVERSIONFULL}"
 
-PLIST_FILES=	bin/containerd-rootless.sh \
-		bin/containerd-rootless-setuptool.sh \
+PLIST_FILES=	bin/containerd-rootless-setuptool.sh \
+		bin/containerd-rootless.sh \
 		bin/nerdctl \
 		etc/bash_completion.d/${PORTNAME} \
 		share/fish/vendor_completions.d/${PORTNAME}.fish \
 		share/zsh/site-functions/_${PORTNAME}
 
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
+
 pre-fetch:
-	@${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
-	[ -e ${DISTDIR}/${DIST_SUBDIR}/go.mod ] || \
-		(${FETCH_CMD} ${FETCH_BEFORE_ARGS} \
-			https://raw.githubusercontent.com/containerd/nerdctl/v2.1.3/go.mod \
-			-o ${DISTDIR}/${DIST_SUBDIR}/go.mod; \
-		${REINPLACE_CMD} '/tigron/d' ${DISTDIR}/${DIST_SUBDIR}/go.mod)
+		@${MKDIR} ${DISTDIR}/${DIST_SUBDIR}/mod/tigron
+		[ -e ${DISTDIR}/${DIST_SUBDIR}/go.mod ] || \
+			(${FETCH_CMD} ${FETCH_BEFORE_ARGS} \
+				https://raw.githubusercontent.com/containerd/nerdctl/v${DISTVERSION}/go.mod \
+				-o ${DISTDIR}/${DIST_SUBDIR}/go.mod; \
+			${REINPLACE_CMD} '/tigron/d' ${DISTDIR}/${DIST_SUBDIR}/go.mod)
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/extras/rootless/* ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
-	@${MKDIR} ${WRKDIR}/tmp
-	${STAGEDIR}${PREFIX}/bin/${PORTNAME} --data-root=${WRKDIR}/tmp completion bash > ${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME}
-	${STAGEDIR}${PREFIX}/bin/${PORTNAME} --data-root=${WRKDIR}/tmp completion fish > ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d/${PORTNAME}.fish
-	${STAGEDIR}${PREFIX}/bin/${PORTNAME} --data-root=${WRKDIR}/tmp completion zsh  > ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME}
+		${INSTALL_SCRIPT} ${WRKSRC}/extras/rootless/* ${STAGEDIR}${PREFIX}/bin
+		@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
+		@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d
+		@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+		@${MKDIR} ${WRKDIR}/tmp
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME} --data-root=${WRKDIR}/tmp completion bash > ${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME}
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME} --data-root=${WRKDIR}/tmp completion fish > ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d/${PORTNAME}.fish
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME} --data-root=${WRKDIR}/tmp completion zsh  > ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME}
+
+post-install-DOCS-on:
+		@${MKDIR} ${STAGEDIR}${DOCSDIR}
+		(cd ${WRKSRC} && ${COPYTREE_SHARE} "README.md docs" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/sysutils/nerdctl/distinfo b/sysutils/nerdctl/distinfo
index af8c383785d6..8df1987f5547 100644
--- a/sysutils/nerdctl/distinfo
+++ b/sysutils/nerdctl/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1752358209
-SHA256 (go/sysutils_nerdctl/containerd-nerdctl-v2.1.3_GH0/go.mod) = 200ff12d1f5ec2d48ce3b798d2e82072cb62b7619932acea3901449e75447455
-SIZE (go/sysutils_nerdctl/containerd-nerdctl-v2.1.3_GH0/go.mod) = 7293
-SHA256 (go/sysutils_nerdctl/containerd-nerdctl-v2.1.3_GH0/containerd-nerdctl-v2.1.3_GH0.tar.gz) = 1c5987c1371bfe29335cc77d967be9b21c8329f8effd65952586e9de28598af2
-SIZE (go/sysutils_nerdctl/containerd-nerdctl-v2.1.3_GH0/containerd-nerdctl-v2.1.3_GH0.tar.gz) = 1475216
+TIMESTAMP = 1761642087
+SHA256 (go/sysutils_nerdctl/nerdctl-v2.1.6/v2.1.6.mod) = 5a202a9901e6361a0373e4b77640fa13bd73ad00d2fc25e01858cb4dabc85679
+SIZE (go/sysutils_nerdctl/nerdctl-v2.1.6/v2.1.6.mod) = 7386
+SHA256 (go/sysutils_nerdctl/nerdctl-v2.1.6/v2.1.6.zip) = a9f2fdde0b1b67906b94d5f94541a9ce078bf8568301494ff85ec849c2074794
+SIZE (go/sysutils_nerdctl/nerdctl-v2.1.6/v2.1.6.zip) = 2116720