diff --git a/dns/yadifa/Makefile b/dns/yadifa/Makefile
index e0c8409884ff..dd08bbcbb216 100644
--- a/dns/yadifa/Makefile
+++ b/dns/yadifa/Makefile
@@ -1,85 +1,85 @@
 PORTNAME=	yadifa
-DISTVERSION=	2.5.0
-DISTVERSIONSUFFIX=	-10188
+DISTVERSION=	2.5.1
+DISTVERSIONSUFFIX=	-10306
 CATEGORIES=	dns
 MASTER_SITES=	https://www.yadifa.eu/sites/default/files/releases/ \
 		https://dns.company/downloads/yadifa/
 
 MAINTAINER=	freebsd@dns.company
 COMMENT=	Authoritative nameserver with DNSSEC capabilities
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c11 cpe libtool ssl
 USE_RC_SUBR=	${PORTNAME}d
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var
 
 SUB_LIST+=	GROUPS="${GROUPS}" \
 		USERS="${USERS}"
 
 USERS=		yadifa
 GROUPS=		yadifa
 
 PLIST_SUB=	GROUPS="${GROUPS}" \
 		USERS="${USERS}"
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README VERSION
 
 OPTIONS_DEFINE=		CTRL DDNS DNSSECTOOLS DOCS ECDSA EXAMPLES KEYGEN \
 			LARGEFILE MASTER NSID RRL RRSIG TCL ZONESIGN
 OPTIONS_DEFAULT=	DDNS DNSSECTOOLS DOCS ECDSA EXAMPLES KEYGEN LARGEFILE \
 			MASTER NSID RRL RRSIG ZONESIGN
 OPTIONS_SUB=		yes
 
 CTRL_DESC=		Remote control
 DDNS_DESC=		Dynamic DNS support (DDNS)
 DNSSECTOOLS_DESC=	DNSSEC module
 ECDSA_DESC=		Elliptic Curve (ECDSA)
 KEYGEN_DESC=		Keygen tool
 LARGEFILE_DESC=		Support for largefiles
 MASTER_DESC=		Use as primary nameserver
 NSID_DESC=		Name Server Identifier Option
 RRL_DESC=		Response Rate Limiting
 RRSIG_DESC=		RRSIG management
 ZONESIGN_DESC=		Zonesign tool
 
 CTRL_CONFIGURE_OFF=		--disable-ctrl
 DDNS_CONFIGURE_OFF=		--disable-dynupdate
 DNSSECTOOLS_CONFIGURE_OFF=	--disable-dnssec-tools
 ECDSA_CONFIGURE_OFF=		--disable-ecdsa
 KEYGEN_CONFIGURE_ENABLE=	keygen
 LARGEFILE_CONFIGURE_OFF=	--disable-largefile
 MASTER_CONFIGURE_OFF=		--disable-master
 NSID_CONFIGURE_OFF=		--disable-nsid
 RRL_CONFIGURE_OFF=		--disable-rrl
 RRSIG_CONFIGURE_OFF=		--disable-rrsig-management
 TCL_USES=			tcl
 ZONESIGN_CONFIGURE_ENABLE=	zonesign
 
 post-configure:
 	${REINPLACE_CMD} -e 's|^docdir = .*|docdir = ${EXAMPLESDIR}|' ${WRKSRC}/etc/Makefile
 	${REINPLACE_CMD} -e 's|/usr/local/var|/var|' -e 's|/var/zones|/var/${PORTNAME}|' ${WRKSRC}/etc/yadifad.conf.example
 
 pre-build:
 	cd ${WRKSRC} && ${MAKE_CMD} features
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/yadifad.conf \
 		${STAGEDIR}${PREFIX}/etc/yadifad.conf.sample
 	${MV} ${STAGEDIR}/var/zones ${STAGEDIR}/var/${PORTNAME}
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 .for f in yadifa yadifad
 	${LN} -s ../../${EXAMPLESDIR_REL}/$f.bash_completion \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/$f.sh
 .endfor
 
 .include <bsd.port.mk>
diff --git a/dns/yadifa/distinfo b/dns/yadifa/distinfo
index af22fd824f25..d47e1f0e2ebb 100644
--- a/dns/yadifa/distinfo
+++ b/dns/yadifa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628693820
-SHA256 (yadifa-2.5.0-10188.tar.gz) = 5cdc4cf61b87fe6d0fdc260386375172b8802a0bd7e63bbf3716ebe1a233fa16
-SIZE (yadifa-2.5.0-10188.tar.gz) = 2655763
+TIMESTAMP = 1632917240
+SHA256 (yadifa-2.5.1-10306.tar.gz) = f943b3752108bada9255858fcd8c58ce90e0047568036838909cd204eb253014
+SIZE (yadifa-2.5.1-10306.tar.gz) = 2677102
diff --git a/dns/yadifa/pkg-plist b/dns/yadifa/pkg-plist
index 42d21b6a1902..61ef6e61e3db 100644
--- a/dns/yadifa/pkg-plist
+++ b/dns/yadifa/pkg-plist
@@ -1,276 +1,278 @@
 %%EXAMPLES%%etc/bash_completion.d/yadifa.sh
 %%EXAMPLES%%etc/bash_completion.d/yadifad.sh
 @sample etc/yadifad.conf.sample
 etc/yakeyrolld.conf
 include/dnscore/acl-config.h
 include/dnscore/acl.h
 include/dnscore/alarm.h
 include/dnscore/allocator.h
 include/dnscore/async.h
 include/dnscore/avl.c.inc
 include/dnscore/avl.h.inc
 include/dnscore/base16.h
 include/dnscore/base32.h
 include/dnscore/base32hex.h
 include/dnscore/base64.h
 include/dnscore/basic-priority-queue.h
 include/dnscore/buffer_input_stream.h
 include/dnscore/buffer_output_stream.h
 include/dnscore/buffered-file.h
 include/dnscore/bytearray_input_stream.h
 include/dnscore/bytearray_output_stream.h
 include/dnscore/bytezarray_output_stream.h
 include/dnscore/chroot.h
 include/dnscore/circular-file.h
 include/dnscore/clone_input_output_stream.h
 include/dnscore/cmdline.h
 include/dnscore/concat_input_stream.h
 include/dnscore/config-cmdline.h
 include/dnscore/config_file_reader.h
 include/dnscore/config_settings.h
 include/dnscore/counter_output_stream.h
 include/dnscore/ctrl-rfc.h
 include/dnscore/debug.h
 include/dnscore/debug_config.h
 include/dnscore/digest.h
 include/dnscore/dns-udp.h
 include/dnscore/dns_resource_record.h
 include/dnscore/dnscore.h
 include/dnscore/dnscore-release-date.h
 include/dnscore/dnsformat.h
 include/dnscore/dnskey-keyring.h
 include/dnscore/dnskey-signature.h
 include/dnscore/dnskey.h
 include/dnscore/dnskey_dsa.h
 include/dnscore/dnskey_ecdsa.h
+include/dnscore/dnskey_eddsa.h
 include/dnscore/dnskey_rsa.h
 include/dnscore/dnsname.h
 include/dnscore/dnsname_set.h
 include/dnscore/dnssec_errors.h
 include/dnscore/empty-input-stream.h
+include/dnscore/error_state.h
 include/dnscore/fdtools.h
 include/dnscore/file-pool.h
 include/dnscore/file.h
 include/dnscore/file_input_stream.h
 include/dnscore/file_output_stream.h
 include/dnscore/filesystem-file.h
 include/dnscore/fingerprint.h
 include/dnscore/format.h
 include/dnscore/hash.h
 include/dnscore/hmac.h
 include/dnscore/host_address.h
 include/dnscore/hsdllist.h
 include/dnscore/identity.h
 include/dnscore/input_stream.h
 include/dnscore/io_stream.h
 include/dnscore/json.h
 include/dnscore/limited_input_stream.h
 include/dnscore/limiter.h
 include/dnscore/list-dl.h
 include/dnscore/list-sl-debug.h
 include/dnscore/list-sl.h
 include/dnscore/logger-output-stream.h
 include/dnscore/logger.h
 include/dnscore/logger_channel_file.h
 include/dnscore/logger_channel_pipe.h
 include/dnscore/logger_channel_stream.h
 include/dnscore/logger_channel_syslog.h
 include/dnscore/logger_handle.h
 include/dnscore/mapped-file.h
 include/dnscore/message-buffer.h
 include/dnscore/message-viewer.h
 include/dnscore/message.h
 include/dnscore/message_dnsupdate.h
 include/dnscore/message_verify_rrsig.h
 include/dnscore/mt_output_stream.h
 include/dnscore/mutex.h
 include/dnscore/network.h
 include/dnscore/nsec3-hash.h
 %%NSID%%include/dnscore/nsid.h
 include/dnscore/openssl.h
 include/dnscore/output_stream.h
 include/dnscore/pace.h
 include/dnscore/packet_reader.h
 include/dnscore/packet_writer.h
 include/dnscore/parser.h
 include/dnscore/parsing.h
 include/dnscore/pid.h
 include/dnscore/pipe_stream.h
 include/dnscore/pool.h
 include/dnscore/popen-output-stream.h
 include/dnscore/print_stream.h
 include/dnscore/process.h
 include/dnscore/ptr_set.h
 include/dnscore/ptr_set_debug.h
 include/dnscore/ptr_vector.h
 include/dnscore/queue-sl.h
 include/dnscore/random.h
 include/dnscore/rc.h
 include/dnscore/rewind-input-stream.h
 include/dnscore/rfc.h
 include/dnscore/serial.h
 include/dnscore/server-setup.h
 include/dnscore/service.h
 include/dnscore/shared-circular-buffer.h
 include/dnscore/shared-heap-bytearray-output-stream.h
 include/dnscore/shared-heap.h
 include/dnscore/signals.h
 include/dnscore/simple-http-server.h
 include/dnscore/socket-server.h
 include/dnscore/string_set.h
 include/dnscore/sys_error.h
 include/dnscore/sys_get_cpu_count.h
 include/dnscore/sys_types.h
 include/dnscore/tcp_io_stream.h
 include/dnscore/tcp_manager.h
 include/dnscore/thread-tag.h
 include/dnscore/thread.h
 include/dnscore/thread_pool.h
 include/dnscore/threaded-qsl-cw.h
 include/dnscore/threaded_dll_cw.h
 include/dnscore/threaded_nb_mm.h
 include/dnscore/threaded_nbrb.h
 include/dnscore/threaded_queue.h
 include/dnscore/threaded_queue_slg.h
 include/dnscore/threaded_ringbuffer.h
 include/dnscore/threaded_ringbuffer_cw.h
 include/dnscore/threaded_ringlist.h
 include/dnscore/timeformat.h
 include/dnscore/timems.h
 include/dnscore/tsig.h
 include/dnscore/typebitmap.h
 include/dnscore/u32_set.h
 include/dnscore/u64_set.h
 include/dnscore/u64_set_debug.h
 include/dnscore/xfr_input_stream.h
 include/dnscore/zalloc.h
 include/dnscore/zone_reader.h
 include/dnscore/zone_reader_axfr.h
 include/dnscore/zone_reader_text.h
 include/dnscore/zonefile_reader.h
 include/dnscore-config-features.h
 include/dnsdb/avl.h
 include/dnsdb/btree.h
 include/dnsdb/chain-replay.h
 include/dnsdb/dictionary-node.h
 include/dnsdb/dictionary.h
 include/dnsdb/dnsdb-config.h
 include/dnsdb/dnsrdata.h
 include/dnsdb/dnssec-keystore.h
 include/dnsdb/dnssec.h
 include/dnsdb/dnssec_config.h
 %%DDNS%%include/dnsdb/dynupdate-diff.h
 %%DDNS%%include/dnsdb/dynupdate.h
 %%DDNS%%include/dnsdb/dynupdate-message.h
 include/dnsdb/htable.h
 include/dnsdb/htbt.h
 include/dnsdb/journal-cjf-common.h
 include/dnsdb/journal-cjf-idxt.h
 include/dnsdb/journal-cjf-page-cache.h
 include/dnsdb/journal-cjf-page-output-stream.h
 include/dnsdb/journal-cjf-page.h
 include/dnsdb/journal-cjf.h
 include/dnsdb/journal-jnl.h
 include/dnsdb/journal.h
 include/dnsdb/journal_ix.h
 include/dnsdb/nsec-chain-replay.h
 include/dnsdb/nsec.h
 include/dnsdb/nsec3-chain-replay.h
 include/dnsdb/nsec3-forall-label.h
 include/dnsdb/nsec3.h
 include/dnsdb/nsec3_collection.h
 include/dnsdb/nsec3_item.h
 include/dnsdb/nsec3_load.h
 include/dnsdb/nsec3_name_error.h
 include/dnsdb/nsec3_nodata_error.h
 include/dnsdb/nsec3_owner.h
 include/dnsdb/nsec3_types.h
 include/dnsdb/nsec3_zone.h
 include/dnsdb/nsec_collection.h
 include/dnsdb/nsec_common.h
 include/dnsdb/rrsig.h
 include/dnsdb/xfr_copy.h
 include/dnsdb/zdb-lock.h
 include/dnsdb/zdb-packed-ttlrdata.h
 include/dnsdb/zdb-zone-answer-axfr.h
 include/dnsdb/zdb-zone-answer-ixfr.h
 include/dnsdb/zdb-zone-arc.h
 include/dnsdb/zdb-zone-dnssec.h
 include/dnsdb/zdb-zone-find.h
 include/dnsdb/zdb-zone-garbage.h
 include/dnsdb/zdb-zone-journal.h
 include/dnsdb/zdb-zone-lock-monitor.h
 include/dnsdb/zdb-zone-lock.h
 include/dnsdb/zdb-zone-maintenance.h
 include/dnsdb/zdb-zone-path-provider.h
 include/dnsdb/zdb-zone-reader-filter.h
 include/dnsdb/zdb.h
 include/dnsdb/zdb_cache.h
 include/dnsdb/zdb_config.h
 include/dnsdb/zdb_error.h
 include/dnsdb/zdb_icmtl.h
 include/dnsdb/zdb_record.h
 include/dnsdb/zdb_rr_label.h
 include/dnsdb/zdb_sanitize.h
 include/dnsdb/zdb_types.h
 include/dnsdb/zdb_utils.h
 include/dnsdb/zdb_zone.h
 include/dnsdb/zdb_zone_axfr_input_stream.h
 include/dnsdb/zdb_zone_label.h
 include/dnsdb/zdb_zone_label_iterator.h
 include/dnsdb/zdb_zone_label_iterator_ex.h
 include/dnsdb/zdb_zone_load.h
 include/dnsdb/zdb_zone_process.h
 include/dnsdb/zdb_zone_write.h
 include/dnslg/config-load.h
 include/dnslg/config-resolver.h
 include/dnslg/dns.h
 include/dnslg/resolv-conf.h
 include/dnslg/resolv.h
 include/dnslg-config-features.h
 include/zdb-config-features.h
 lib/libdnscore.a
 lib/libdnsdb.a
 lib/libdnslg.a
 man/man5/yadifa.conf.5.gz
 man/man5/yadifa.rc.5.gz
 man/man5/yadifad.conf.5.gz
 man/man5/yakeyrolld.conf.5.gz
 man/man8/yadifa.8.gz
 man/man8/yadifad.8.gz
 man/man8/yakeyrolld.8.gz
 sbin/yadifad
 sbin/yakeyrolld
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keys.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifa.bash_completion
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifa.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad-primary.conf.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad-secondary.conf.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.bash_completion
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.init
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.init.debian
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.init.rhel
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.logrotate
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.service
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.service.arch
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.service.debian
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.service.rhel
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yakeyrolld.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yakeyrolld.conf.example
 /var/yadifa/masters/0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa.zone
 /var/yadifa/masters/0.0.127.in-addr.arpa.zone
 /var/yadifa/masters/localhost.zone
 /var/yadifa/masters/localhost6.zone
 /var/yadifa/masters/somedomain.eu.zone
 @dir /var/log
 @dir(%%USERS%%,%%GROUPS%%,750) /var/log/yadifa
 @dir(%%USERS%%,%%GROUPS%%,750) /var/log/yadifad
 @dir(%%USERS%%,%%GROUPS%%,750) /var/log/yakeyrolld
 @dir(%%USERS%%,%%GROUPS%%,750) /var/plans
 @dir(%%USERS%%,%%GROUPS%%,750) /var/yadifa
 @dir(%%USERS%%,%%GROUPS%%,750) /var/yadifa/keys
 @dir(%%USERS%%,%%GROUPS%%,750) /var/yadifa/masters
 @dir(%%USERS%%,%%GROUPS%%,750) /var/yadifa/slaves
 @dir(%%USERS%%,%%GROUPS%%,750) /var/yadifa/xfr
 @postexec chown -R %%USERS%%:%%GROUPS%% /var/yadifa