diff --git a/dns/knot3/Makefile b/dns/knot3/Makefile
index 77725ec40458..49babddf54e9 100644
--- a/dns/knot3/Makefile
+++ b/dns/knot3/Makefile
@@ -1,122 +1,123 @@
 # Created by: Leo Vandewoestijne <freebsd@dns.company>
 
 PORTNAME=	knot
-DISTVERSION=	3.0.7
+DISTVERSION=	3.0.8
 CATEGORIES=	dns
 MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
 		https://dns.company/downloads/knot-dns/
 PKGNAMESUFFIX?=	3
 
 MAINTAINER=	freebsd@dns.company
 COMMENT=	High performance authoritative-only DNS server
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-#BUILD_DEPENDS=	autoconf>=2.65:devel/autoconf \
-#		gsed:textproc/gsed
 BUILD_DEPENDS=	gsed:textproc/gsed
 LIB_DEPENDS=	libgnutls.so:security/gnutls \
-		liblmdb.so:databases/lmdb \
-		libnghttp2.so:www/libnghttp2
+		liblmdb.so:databases/lmdb
 
-USES=		alias autoreconf libtool localbase pkgconfig tar:xz
-
-CONFLICTS=	knot-1.* knot1-[0-6].* knot2-[0-9].*
+USES=		alias libtool localbase pkgconfig tar:xz
+USE_LDCONFIG=	yes
 
 HAS_CONFIGURE=	yes
-BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 CONFIGURE_ARGS=	--enable-recvmmsg=no \
 		--mandir=${MANPREFIX}/man \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
 .if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
 CONFIGURE_ARGS+=	--with-rundir=/var/run/knot \
 			--with-storage=/var/db/knot
 LIB_DEPENDS+=		liburcu.so:sysutils/liburcu
 USE_RC_SUBR=		${PORTNAME}
-#PLIST_FILES=		etc/rc.d/${PORTNAME}
 SUB_FILES=		pkg-message
 USES+=			libedit
 .endif
 
 .if defined(UTILS_ONLY) || defined(LIB_ONLY)
 CONFIGURE_ARGS+=	--disable-daemon \
 			--disable-modules
 .endif
 
 .if defined(LIB_ONLY)
 CONFIGURE_ARGS+=	--disable-utilities
 .endif
 
-USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
+CONFLICTS=	knot-1.* knot1-[0-6].* knot2-[0-9].*
+
+BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
+
 USERS=		knot
 GROUPS=		knot
 SUB_LIST+=	GROUPS="${GROUPS}" \
 		USERS="${USERS}"
 
 PORTDOCS=	COPYING NEWS
 
 OPTIONS_DEFINE=	DNSTAP DOCS
 
 .if !defined(LIB_ONLY)
-OPTIONS_DEFINE+=	IDN
+OPTIONS_DEFINE+=	DOH IDN
+OPTIONS_DEFAULT+=	DOH IDN
 .endif
 
 .if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
 OPTIONS_DEFINE+=	FASTPARSER MAXMINDDB
 .endif
 
 DNSTAP_DESC=			dnstap support (see dnstap.info)
-DNSTAP_CONFIGURE_ENABLE=	dnstap
-DNSTAP_CONFIGURE_WITH=		module-dnstap=yes
 DNSTAP_LIB_DEPENDS=		libfstrm.so:devel/fstrm \
 				libprotobuf-c.so:devel/protobuf-c
+DNSTAP_CONFIGURE_ENABLE=	dnstap
+DNSTAP_CONFIGURE_WITH=		module-dnstap=yes
 
 # XXX: because `kdig_CPPFLAGS += $(DNSTAP_CFLAGS)' line is missing from
 # `src/Makefile.am' file (and thus pre-generated `src/Makefile.in') which
 # should contain "$libfstrm_CFLAGS $libprotobuf_c_CFLAGS" set by configure
 # script, provide it here explicitly as patching those files would result
 # in higher line count.  Ideally this bug should be fixed upstream.
 DNSTAP_CPPFLAGS=	-I${LOCALBASE}/include
 
 DOCS_CONFIGURE_OFF=	--disable-documentation
 
+DOH_DESC=		DoH support in kdig
+DOH_LIB_DEPENDS=	libnghttp2.so:www/libnghttp2
+
 FASTPARSER_DESC=		Fast zone parser (demanding compilation)
 FASTPARSER_CONFIGURE_ENABLE=	fastparser
 
 IDN_CONFIGURE_WITH=	libidn
 IDN_CONFIGURE_OFF=	--without-libidn
-#IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
+IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
 
 MAXMINDDB_DESC=			Enable MaxMind for geodb module
 MAXMINDDB_LIB_DEPENDS=		libmaxminddb.so:net/libmaxminddb
 MAXMINDDB_CONFIGURE_ENABLE=	maxminddb
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == i386
 USES+=		autoreconf
 .endif
 
 post-patch:
 .if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
 	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
 		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|' \
 		${WRKSRC}/src/Makefile.in
 	@${RM} -r ${WRKSRC}/src/zscanner/scanner.c
 .endif
 
 post-install:
 .if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
 	${MV} ${STAGEDIR}${ETCDIR}/knot.sample.conf \
 		${STAGEDIR}${ETCDIR}/knot.conf.sample
 	@${MKDIR} ${STAGEDIR}/var/run/knot ${STAGEDIR}/var/db/knot
 .endif
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/dns/knot3/distinfo b/dns/knot3/distinfo
index 2ea42526412e..2ada57cd31ee 100644
--- a/dns/knot3/distinfo
+++ b/dns/knot3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623930813
-SHA256 (knot-3.0.7.tar.xz) = 2bad8be0be95c8f54a26d1e16299e65f31ae1b34bd6ad3819aa50e7b40521484
-SIZE (knot-3.0.7.tar.xz) = 1334788
+TIMESTAMP = 1626854909
+SHA256 (knot-3.0.8.tar.xz) = df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
+SIZE (knot-3.0.8.tar.xz) = 1336624