diff --git a/net-mgmt/check_mk_agent/Makefile b/net-mgmt/check_mk_agent/Makefile
index 3134349c75b7..2964d9a8cca1 100644
--- a/net-mgmt/check_mk_agent/Makefile
+++ b/net-mgmt/check_mk_agent/Makefile
@@ -1,71 +1,71 @@
 PORTNAME=	check_mk_agent
-PORTVERSION=	2.4.0p20
+PORTVERSION=	2.5.0p9
 CATEGORIES=	net-mgmt
 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: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
+_TAG=			d2d9245
 
 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 c69efa298788..06dc635429a5 100644
--- a/net-mgmt/check_mk_agent/distinfo
+++ b/net-mgmt/check_mk_agent/distinfo
@@ -1,7 +1,7 @@
-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
+TIMESTAMP = 1785580470
+SHA256 (check_mk_agent-2.5.0p9/check_mk_agent.freebsd) = eb2fe462249ecc7b0d7cd22346280dfa3ca29189e983d6860ec77b8adc33d31a
+SIZE (check_mk_agent-2.5.0p9/check_mk_agent.freebsd) = 37165
+SHA256 (check_mk_agent-2.5.0p9/README.FreeBSD) = 81f67b7d9407f977b4ddbccdd861788f4070fb0773591a89e2c320876aef69df
+SIZE (check_mk_agent-2.5.0p9/README.FreeBSD) = 1348
+SHA256 (check_mk_agent-2.5.0p9/COPYING) = fbaab079995bef694ef8451f0f763b91b44e5b57b8e2a487d2a240b395187a7f
+SIZE (check_mk_agent-2.5.0p9/COPYING) = 15174
diff --git a/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd b/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd
deleted file mode 100644
index 43c62cdc052e..000000000000
--- a/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd
+++ /dev/null
@@ -1,24 +0,0 @@
---- check_mk_agent.freebsd.orig	2024-10-02 06:30:56 UTC
-+++ check_mk_agent.freebsd
-@@ -142,6 +142,21 @@ preamble_1() {
-     [ "${PATH#*"/usr/local/sbin"}" != "${PATH}" ] || PATH="${PATH}:/usr/local/sbin"
-     [ -d "/var/qmail/bin" ] && { [ "${PATH#*"/var/qmail/bin"}" != "${PATH}" ] || PATH="${PATH}:/var/qmail/bin"; }
- 
-+    echo '<<<sysctl_mem>>>'
-+    _page_size=$( sysctl -n vm.stats.vm.v_page_size )
-+    echo "mem.cache $(( _page_size * $( sysctl -n vm.stats.vm.v_cache_count ) ))"
-+    echo "mem.free $(( _page_size * $( sysctl -n vm.stats.vm.v_free_count ) ))"
-+    echo "mem.total $( sysctl -n hw.physmem )"
-+    echo "mem.used $(( _page_size * ( $( sysctl -n vm.stats.vm.v_active_count ) + $( sysctl -n vm.stats.vm.v_wire_count ) ) ))"
-+    _swap_total=$( sysctl -n vm.swap_total )
-+    _swap_used=$(( $( swapinfo | tail -1 | awk '{print $3}' ) * 1024 ))
-+    echo "swap.free $(( _swap_total - _swap_used ))"
-+    echo "swap.total ${_swap_total}"
-+    echo "swap.used ${_swap_used}"
-+    unset -v _page_size
-+    unset -v _swap_total
-+    unset -v _swap_used
-+
-     # All executables in PLUGINSDIR will simply be executed and their
-     # ouput appended to the output of the agent. Plugins define their own
-     # sections and must output headers with '<<<' and '>>>'