diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile
index 249490668206..b179d9b2598a 100644
--- a/sysutils/podman/Makefile
+++ b/sysutils/podman/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	podman
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.8.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
+PATCH_SITES=	https://github.com/containers/podman/commit/
+PATCHFILES+=	9a10cefd18a3f19e49aa6ae5683d1bcea37bdc97.patch:-p1 # https://github.com/containers/podman/pull/28317
 MAINTAINER=	dfr@FreeBSD.org
 COMMENT=	Manage Pods, Containers and Container Images
 WWW=		https://podman.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash \
 		ggrep:textproc/gnugrep \
 		go-md2man:textproc/go-md2man \
 		gsed:textproc/gsed
 LIB_DEPENDS=	libgpgme.so:security/gpgme
 RUN_DEPENDS=	conmon:sysutils/conmon \
 		containernetworking-plugins>=0:net/containernetworking-plugins \
 		containers-common>=0:sysutils/containers-common \
 		ocijail:sysutils/ocijail
 
-USES=		gmake go:1.24+,no_targets pkgconfig python:build shebangfix
+USES=		gmake go:no_targets pkgconfig python:build shebangfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	containers
 USE_RC_SUBR=	podman podman_service
 
 SHEBANG_FILES=	${WRKSRC}/hack/markdown-preprocess
 MAKE_ARGS=	SHELL=${LOCALBASE}/bin/bash
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	containers
-GH_PROJECT=	podman
-
 INSTALL_TARGET=	install install.completions
 
 .include <bsd.port.mk>
diff --git a/sysutils/podman/distinfo b/sysutils/podman/distinfo
index 193a58d87201..633bff466669 100644
--- a/sysutils/podman/distinfo
+++ b/sysutils/podman/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1773330358
+TIMESTAMP = 1775589044
 SHA256 (containers-podman-v5.8.1_GH0.tar.gz) = b9540ecb19cfcbcfc40e1b81d39930f688c537d8fd6f11ae56be41f2bf9e97a4
 SIZE (containers-podman-v5.8.1_GH0.tar.gz) = 21297794
+SHA256 (9a10cefd18a3f19e49aa6ae5683d1bcea37bdc97.patch) = f0ac5d68704c4ef09885d5a15ac08260bc4aad380df3720640c0bb89d7ab402c
+SIZE (9a10cefd18a3f19e49aa6ae5683d1bcea37bdc97.patch) = 1633