diff --git a/net-mgmt/check_mk_agent/Makefile b/net-mgmt/check_mk_agent/Makefile
index 674faa3870fe..3134349c75b7 100644
--- a/net-mgmt/check_mk_agent/Makefile
+++ b/net-mgmt/check_mk_agent/Makefile
@@ -1,72 +1,71 @@
 PORTNAME=	check_mk_agent
-DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.0p16
-PORTREVISION=	1
+PORTVERSION=	2.4.0p20
 CATEGORIES=	net-mgmt
-MASTER_SITES=	https://raw.githubusercontent.com/Checkmk/checkmk/${DISTVERSIONFULL}/agents/:agent \
-		https://raw.githubusercontent.com/Checkmk/checkmk/${DISTVERSIONFULL}/doc/agents/:doc \
-		https://raw.githubusercontent.com/Checkmk/checkmk/${DISTVERSIONFULL}/:license
+MASTER_SITES=	https://raw.githubusercontent.com/Checkmk/checkmk/${_TAG}/agents/:agent \
+		https://raw.githubusercontent.com/Checkmk/checkmk/${_TAG}/doc/agents/:doc \
+		https://raw.githubusercontent.com/Checkmk/checkmk/${_TAG}/:license
 DISTFILES=	${_CHECKMK_AGENT}:agent \
 		README.FreeBSD:doc \
 		COPYING:license
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ivalentine@arizona.edu
 COMMENT=	Checkmk agent to monitor *nix style systems
 WWW=		https://checkmk.com/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	bash:shells/bash \
 		ipmitool:sysutils/ipmitool \
 		statgrab:devel/libstatgrab \
 		wget:ftp/wget
 
-USES=		perl5 python:3.4+,run shebangfix
+USES=		perl5 python:run shebangfix
 USE_PERL5=	run
 
 SHEBANG_FILES=	${_CHECKMK_AGENT}
 
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	# none
 EXTRACT_AFTER_ARGS=	${WRKSRC}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 NO_TEST=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PORTNAME=${PORTNAME}
 
 NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/${PORTNAME}
 
 PORTDOCS=	README.FreeBSD
 
 OPTIONS_DEFINE=	DOCS
 
 _CHECKMK_AGENT=		${PORTNAME}.freebsd
 _CHECKMK_LIBDIR=	${PREFIX}/lib/check_mk_agent
 _CHECKMK_CONFDIR=	${PREFIX}/etc/check_mk
 _CHECKMK_VARDIR=	/var/db/check_mk_agent
+_TAG=			7e6a4f8
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|/usr/local/lib/check_mk_agent|${_CHECKMK_LIBDIR}|' \
 		-e 's|/etc/check_mk|${_CHECKMK_CONFDIR}|' \
 		-e 's|/var/lib/check_mk_agent|${_CHECKMK_VARDIR}|' \
 		-e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/${_CHECKMK_AGENT}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${_CHECKMK_AGENT} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.FreeBSD \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/check_mk_agent/distinfo b/net-mgmt/check_mk_agent/distinfo
index fb8c50669ecb..c69efa298788 100644
--- a/net-mgmt/check_mk_agent/distinfo
+++ b/net-mgmt/check_mk_agent/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1726934943
-SHA256 (check_mk_agent-2.3.0.p16/check_mk_agent.freebsd) = 2494dac13e9a3619c5164a00a87c6c3a8e77957cec71284ceab2cac0cc749d17
-SIZE (check_mk_agent-2.3.0.p16/check_mk_agent.freebsd) = 32404
-SHA256 (check_mk_agent-2.3.0.p16/README.FreeBSD) = 01094a2197ca0a3a43ac16098c0f800d2ee808db2fd9a2f133f4bad04062ec5f
-SIZE (check_mk_agent-2.3.0.p16/README.FreeBSD) = 1349
-SHA256 (check_mk_agent-2.3.0.p16/COPYING) = fbaab079995bef694ef8451f0f763b91b44e5b57b8e2a487d2a240b395187a7f
-SIZE (check_mk_agent-2.3.0.p16/COPYING) = 15174
+TIMESTAMP = 1769595959
+SHA256 (check_mk_agent-2.4.0p20/check_mk_agent.freebsd) = 284eba0ab7505d25e9326fbfa6cd6db90cdcd5dca475bc970a6771e92767b418
+SIZE (check_mk_agent-2.4.0p20/check_mk_agent.freebsd) = 36231
+SHA256 (check_mk_agent-2.4.0p20/README.FreeBSD) = 01094a2197ca0a3a43ac16098c0f800d2ee808db2fd9a2f133f4bad04062ec5f
+SIZE (check_mk_agent-2.4.0p20/README.FreeBSD) = 1349
+SHA256 (check_mk_agent-2.4.0p20/COPYING) = fbaab079995bef694ef8451f0f763b91b44e5b57b8e2a487d2a240b395187a7f
+SIZE (check_mk_agent-2.4.0p20/COPYING) = 15174