diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index c48eccfe6046..7b8937e5d1ad 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -1,92 +1,92 @@
 PORTNAME=	ntp
 PORTVERSION=	4.2.8p18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
 		http://archive.ntp.org/ntp4/ntp-4.2/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/P/p/:S/.r/-RC/}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	The Network Time Protocol Distribution
 WWW=		https://www.ntp.org/
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 BUILD_DPENDS=	autogen:devel/autogen
 
 CONFLICTS=	ntpsec openntpd
 
 USES=		cpe pathfix shebangfix libedit libtool localbase:ldflags \
 		pkgconfig
 USES+=		autoreconf # until rlimit_memlock changes accepted upstream
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-leap-smear --enable-trustedbsd-mac \
 		--with-locfile=freebsd --with-memlock=-1
 GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
 
 TEST_TARGET=	check
 
 SHEBANG_FILES=	scripts/ntptrace/ntptrace.in \
 		scripts/ntp-wait/ntp-wait.in \
 		scripts/update-leap/update-leap.in
 perl_OLD_CMD=	@PATH_PERL@
 
 SUB_FILES=	pkg-message
 
 .include "Makefile.inc"
 
 OPTIONS_DEFINE+=	DEBUG NLS THREADS
 OPTIONS_DEFAULT+=	THREADS
 OPTIONS_SUB=		yes
 
 DEBUG_CONFIGURE_ENABLE=	debugging
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CONFIGURE_OFF=	ac_cv_lib_intl_gettext=no
 NLS_USES=	gettext-runtime
 
 NTP_SIGND_CONFIGURE_ENABLE=	ntp-signd
 
 NTPSNMPD_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 NTPSNMPD_CONFIGURE_OFF=	--without-ntpsnmpd
 
 PERL_UTILS_USES=	perl5
 
 SSL_CONFIGURE_ON=	--with-openssl-incdir=${OPENSSLINC} \
 			--with-openssl-libdir=${OPENSSLLIB}
 SSL_CONFIGURE_OFF=	--without-crypto
 SSL_USES=		ssl
 
 DEBUG_CONFIGURE_ON=	--enable-debug
 
 THREADS_CONFIGURE_ENABLE=	thread-support
 THREADS_CONFIGURE_WITH=		threads
 
 MD5_LIB_DEPENDS=	libmd5.so:www/libwww
 MD5_IMPLIES=		SSL
 
 .for D in ${NTP_DRIVERS}
 ${D}_CONFIGURE_ENABLE=	${D}
 .endfor
 
 .include <bsd.port.pre.mk>
 
 # XXX Temporary hack. Remember to remove this next commit.
 post-extract:
 	@${TOUCH} ${WRKSRC}/scripts/build/checkHtmlFileDates
 	@${CHMOD} +x ${WRKSRC}/scripts/build/checkHtmlFileDates
 
 post-configure:
 	@${ECHO_CMD} '#define HAVE_CLOSEFROM	1' >> ${WRKSRC}/config.h
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 	@cd ${WRKSRC}/html && ${FIND} . -print | \
 		${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/net/ntp/files/patch-ntpd_ntp__io.c b/net/ntp/files/patch-ntpd_ntp__io.c
index b2bbf0fee058..10bac6d961f7 100644
--- a/net/ntp/files/patch-ntpd_ntp__io.c
+++ b/net/ntp/files/patch-ntpd_ntp__io.c
@@ -1,11 +1,22 @@
 --- ntpd/ntp_io.c.orig	2024-05-07 04:21:17.000000000 -0700
-+++ ntpd/ntp_io.c	2025-02-18 19:31:18.434141000 -0800
-@@ -3205,7 +3205,7 @@
++++ ntpd/ntp_io.c	2025-02-18 19:38:16.412031000 -0800
+@@ -1486,9 +1486,7 @@
+ 
+ 	if (IS_IPV6(psau)) {
+ 		p6addr = &psau->sa6.sin6_addr;
+-		if (   IN6_IS_ADDR_LINKLOCAL(p6addr)
+-		    || IN6_IS_ADDR_SITELOCAL(p6addr)) {
+-
++		if (IN6_IS_ADDR_LINKLOCAL(p6addr)) {
+ 			return TRUE;
+ 		}
+ 	} else if (IS_IPV4(psau)) {
+@@ -3205,7 +3203,7 @@
  	}
  
  	do {
 -		if (INT_LL_OF_GLOB & src->flags) {
 +		if (ismcast && INT_LL_OF_GLOB & src->flags) {
  			/* avoid duplicate multicasts on same IPv6 net */
  			goto loop;
  		}
diff --git a/net/ntp/files/patch-ntpd_ntp_proto.c b/net/ntp/files/patch-ntpd_ntp_proto.c
deleted file mode 100644
index d691fd1caade..000000000000
--- a/net/ntp/files/patch-ntpd_ntp_proto.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- ntpd/ntp_proto.c.orig	2024-05-07 04:21:28.000000000 -0700
-+++ ntpd/ntp_proto.c	2024-12-23 14:40:06.218503000 -0800
-@@ -471,6 +471,7 @@
- 		return;
- 	}
- 
-+#if 0
- 	/* [Bug 3851] drop pool servers which can no longer be reached. */
- 	if (MDF_PCLNT & peer->cast_flags) {
- 		if (   (IS_IPV6(&peer->srcadr) && !nonlocal_v6_addr_up)
-@@ -479,6 +480,7 @@
- 			return;
- 		}
- 	}
-+#endif
- 
- 	 /*
- 	 * In unicast modes the dance is much more intricate. It is