diff --git a/sysutils/skopeo/Makefile b/sysutils/skopeo/Makefile
index 70228d2a56d8..04fd80f691d9 100644
--- a/sysutils/skopeo/Makefile
+++ b/sysutils/skopeo/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	skopeo
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.20.0
+DISTVERSION=	1.21.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	dfr@FreeBSD.org
 COMMENT=	Inspect container images and repositories on registries
 WWW=		https://github.com/containers/skopeo
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash \
 		curl:ftp/curl \
 		go-md2man:textproc/go-md2man
 LIB_DEPENDS=	libgpgme.so:security/gpgme
 RUN_DEPENDS=	${LOCALBASE}/etc/containers/containers.conf.sample:sysutils/containers-common
 
-USES=		gmake go:modules,no_targets,1.23 pkgconfig
+USES=		gmake go:modules,no_targets,1.24 pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	containers
 
 do-install:
 	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GMAKE} -C ${WRKSRC} \
 		DESTDIR=${STAGEDIR} GOCACHE=${TMPDIR} \
 		GO=${GO_CMD} install-binary install-docs install-completions
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/containers/registries.d
 	${INSTALL_DATA} ${WRKSRC}/default.yaml ${STAGEDIR}${PREFIX}/etc/containers/registries.d/default.yaml
 
 .include <bsd.port.mk>
diff --git a/sysutils/skopeo/distinfo b/sysutils/skopeo/distinfo
index 4e07122cc4cd..42686776425f 100644
--- a/sysutils/skopeo/distinfo
+++ b/sysutils/skopeo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1755745937
-SHA256 (containers-skopeo-v1.20.0_GH0.tar.gz) = 0c19fe51b2cd8d1bd5e38c03b97421e318fc08153bdf5ef2f816a29889eacdef
-SIZE (containers-skopeo-v1.20.0_GH0.tar.gz) = 10449131
+TIMESTAMP = 1765208908
+SHA256 (containers-skopeo-v1.21.0_GH0.tar.gz) = f76eeddf697a3cc7a872e3077ab4d0fdbebe9f3c6171462e3e9feb84368b3fac
+SIZE (containers-skopeo-v1.21.0_GH0.tar.gz) = 10187308
diff --git a/sysutils/skopeo/files/patch-Makefile b/sysutils/skopeo/files/patch-Makefile
index 9e47fcbdd889..4a7619c98d29 100644
--- a/sysutils/skopeo/files/patch-Makefile
+++ b/sysutils/skopeo/files/patch-Makefile
@@ -1,23 +1,14 @@
---- Makefile.orig	2025-10-17 08:57:36 UTC
+--- Makefile.orig	2025-12-08 15:49:16 UTC
 +++ Makefile
-@@ -84,7 +84,7 @@ EXTRA_LDFLAGS ?=
- GIT_COMMIT := $(shell GIT_CEILING_DIRECTORIES=$$(cd ..; pwd) git rev-parse HEAD 2> /dev/null || true)
- 
- EXTRA_LDFLAGS ?=
--SKOPEO_LDFLAGS := -ldflags '-X main.gitCommit=${GIT_COMMIT} $(EXTRA_LDFLAGS)'
-+SKOPEO_LDFLAGS := -ldflags '-X main.gitCommit="unknown" $(EXTRA_LDFLAGS)'
- 
- MANPAGES_MD = $(wildcard docs/*.md)
- MANPAGES ?= $(MANPAGES_MD:%.md=%)
 @@ -131,9 +131,9 @@ bin/skopeo:
  # Build w/o using containers
  .PHONY: bin/skopeo
  bin/skopeo:
 -	$(GO) build ${GO_DYN_FLAGS} ${SKOPEO_LDFLAGS} -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o $@ ./cmd/skopeo
 +	$(GO) build -buildvcs=false ${GO_DYN_FLAGS} ${SKOPEO_LDFLAGS} -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o $@ ./cmd/skopeo
  bin/skopeo.%:
 -	GOOS=$(word 2,$(subst ., ,$@)) GOARCH=$(word 3,$(subst ., ,$@)) $(GO) build ${SKOPEO_LDFLAGS} -tags "containers_image_openpgp $(BUILDTAGS)" -o $@ ./cmd/skopeo
 +	GOOS=$(word 2,$(subst ., ,$@)) GOARCH=$(word 3,$(subst ., ,$@)) $(GO) build -buildvcs=false ${SKOPEO_LDFLAGS} -tags "containers_image_openpgp $(BUILDTAGS)" -o $@ ./cmd/skopeo
  local-cross: bin/skopeo.darwin.amd64 bin/skopeo.linux.arm bin/skopeo.linux.arm64 bin/skopeo.windows.386.exe bin/skopeo.windows.amd64.exe
  
  $(MANPAGES): %: %.md