diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 30c4715616e0..8889be753ab8 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	cvs
 PORTVERSION=	1.20120905
-PORTREVISION?=	8
+PORTREVISION?=	9
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/eadler
 
 MAINTAINER?=	schaiba@gmail.com
 COMMENT?=	Version control system
 
 LICENSE=	GPLv2+
 
 USES=		cpe shebangfix tar:xz uidfix
 
 CONFLICTS_INSTALL?=	cvs-devel cvs+ipv6
 
 OPTIONS_DEFINE=	INFO IPV6 KERBEROS EXAMPLES
 OPTIONS_DEFAULT=INFO KERBEROS
 .if !make(makesum)
 OPTIONS_EXCLUDE?=IPV6
 .endif
 
 INFO_INFO=		cvs cvsclient
 INFO_USES=		makeinfo
 IPV6_PATCH_SITES=	LOCAL/ume
 IPV6_PATCHFILES=	${DISTNAME}-v6-20140105.diff.gz:-p1
 KERBEROS_MAKE_ARGS=	KERBEROS_SUPPORT=yes
 
 CPE_VENDOR=	gnu
 SHEBANG_FILES=	contrib/clmerge contrib/cln_hist \
 		contrib/commit_prep contrib/cvs_acls \
 		contrib/easy-import contrib/log \
 		contrib/log_accum contrib/mfpipe \
 		contrib/rcslock
 PATCH_WRKSRC=	${WRKDIR}/call/cvs
 WRKSRC=		${WRKDIR}/call/cvs-build
 
 # bsd.stage.makes sets the wrong value for DESTDIR
 DESTDIRNAME=	NADA
 MAKE_ARGS=	DESTDIR=${STAGEDIR}${PREFIX}
 # XXX static PIE libraries not yet supported by the base system
 MAKE_ARGS+=	WITHOUT_PIE=true
 MAKE_ARGS+=	MANDIR=/share/man/man
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,/info/,/${INFO_PATH}/,g" ${WRKSRC}/Makefile.inc
 .if !${PORT_OPTIONS:MINFO}
 	@${REINPLACE_CMD} -e "s,doc,,g" ${WRKSRC}/Makefile
 .endif
 pre-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
 
 .include <bsd.port.mk>
diff --git a/devel/cvs/files/patch-cvs__Makefile b/devel/cvs/files/patch-cvs__Makefile
index cf03aa11ab05..cf34e74906d3 100644
--- a/devel/cvs/files/patch-cvs__Makefile
+++ b/devel/cvs/files/patch-cvs__Makefile
@@ -1,16 +1,28 @@
 --- ../cvs-build/cvs/Makefile.orig	2012-09-05 19:25:43.000000000 -0700
-+++ ../cvs-build/cvs/Makefile	2021-01-02 17:11:22.159883000 -0800
-@@ -29,10 +29,10 @@
++++ ../cvs-build/cvs/Makefile	2025-08-05 23:33:37.681784000 -0700
+@@ -29,15 +29,22 @@
  	 -I/usr/include/gnu \
  	 -I${CVSDIR}/lib -I${CVSDIR}/diff -I.
  
 -DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
 -LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
 +DPADD=	${LIBCVS} ${LIBDIFF} ${LIBMD} ${LIBCRYPT} ${LIBZ}
 +LDADD=	${LIBCVS} ${LIBDIFF} -lmd -lcrypt -lz
  
 -.if ${MK_KERBEROS_SUPPORT} != "no"
 +.if defined(KERBEROS_SUPPORT)
++.if exists(/usr/libexec/krb5kdc)
++# MIT KRB5
++LDADD+= -lgssapi_krb5 -lkrb5 -lkrb5support -lcrypto -lcrypt -lcom_err
++DPADD+= ${LIBGSSAPI_KRB5} ${LIBKRB5} ${LIBKRB5SUPPORT} ${LIBCRYPTO}
++DPADD+= ${LIBCRYPT} ${LIBCOM_ERR}
++.else
  CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION
  LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcrypto -lroken -lcrypt -lcom_err
  DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN}
+ DPADD+= ${LIBCRYPT} ${LIBCOM_ERR}
+ .endif
++.endif
+ 
+ #
+ # Regression test support