diff --git a/dns/knot-resolver6/Makefile b/dns/knot-resolver6/Makefile
index a319a547ea9a..194ff3244636 100644
--- a/dns/knot-resolver6/Makefile
+++ b/dns/knot-resolver6/Makefile
@@ -1,118 +1,96 @@
 PORTNAME=	knot-resolver
-DISTVERSION=	6.0.17
+DISTVERSION=	6.1.0
 CATEGORIES=	dns
 MASTER_SITES=	https://knot-resolver.nic.cz/release/ \
 		https://dns.company/downloads/knot-resolver/
 PKGNAMESUFFIX?=	6
 
 MAINTAINER=	freebsd@dns.company
 COMMENT=	Caching full resolver implementation
 WWW=		https://www.knot-resolver.cz/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash \
 		flake8:devel/py-flake8@${PY_FLAVOR} \
-		lua51-cqueues>=20200726_1:devel/lua-cqueues@lua51 \
+		${LUA_FLAVOR}-cqueues>=20200726_1:devel/lua-cqueues@${LUA_FLAVOR} \
 		luacheck:devel/lua-luacheck
 LIB_DEPENDS=	libdnssec.so:dns/knot3 \
 		libgnutls.so:security/gnutls \
 		libknot.so:dns/knot3 \
 		liblmdb.so:databases/lmdb \
 		libnghttp2.so:www/libnghttp2 \
 		libuv.so:devel/libuv \
 		libzscanner.so:dns/knot3
-RUN_DEPENDS=	lua51-cqueues>=20200726_1:devel/lua-cqueues@lua51
+RUN_DEPENDS=	${LUA_FLAVOR}-cqueues>=20200726_1:devel/lua-cqueues@${LUA_FLAVOR}
 
-USES=		cmake:indirect compiler:c11 luajit meson ncurses ninja \
-		pkgconfig python:build tar:xz
+USES=		cmake:indirect compiler:c11 lua:build,run luajit meson ncurses \
+		ninja pkgconfig python:build tar:xz
 USE_CXXSTD=	c++11
 USE_RC_SUBR=	krescachegc kresd
 
 CMAKE_ARGS+=	-DCLANG_TIDY=${LOCALBASE}/bin/clang-tidy${COMPILER_VERSION:C/.$//} \
 		-DRUN_CLANG_TIDY=${LOCALBASE}/llvm${COMPILER_VERSION:C/.$//}/bin/run-clang-tidy
 
 MESON_ARGS=	--buildtype=release \
 		--default-library=static \
 		--libdir=${PREFIX}/lib \
 		--pkg-config-path=${PREFIX}/libdata/pkgconfig \
 		--prefix=${LOCALBASE} \
+		--strip \
 		-Dgroup=${GROUPS} \
 		-Dinstall_kresd_conf=enabled \
 		-Dkeyfile_default=${ETCDIR}/root.keys \
 		-Dmalloc=auto \
 		-Droot_hints=${ETCDIR}/root.hints \
 		-Duser=${USERS} \
 		-Dutils=enabled
 
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 CONFLICTS=	knot-resolver-[0-5].*
 
 SUB_FILES=	pkg-message
 
 KRESD_USER=	kresd
 KRESD_GROUP=	kresd
 KRESD_RUNDIR=	/var/run/kresd
 
 SUB_LIST=	GROUPS=${GROUPS} \
 		RUNDIR=${RUNDIR} \
 		USERS=${USERS}
 
 USERS=		${KRESD_USER}
 GROUPS=		${KRESD_GROUP}
 RUNDIR=		${KRESD_RUNDIR}
 
 PLIST_SUB=	GROUPS=${GROUPS} \
 		RUNDIR=${RUNDIR} \
 		USERS=${USERS}
 
 PORTDOCS=	AUTHORS COPYING CodingStyle NEWS README.md
 PORTEXAMPLES=	config.cluster config.docker config.internal config.isp \
 		config.personal config.privacy config.splitview
 
 OPTIONS_DEFINE=		DOCS EXAMPLES DNSTAP TESTUNIT
 
 DNSTAP_DESC=		dnstap support
 TESTUNIT_DESC=		Build unit tests
 
 DNSTAP_LIB_DEPENDS=	libfstrm.so:devel/fstrm \
 			libprotobuf-c.so:devel/protobuf-c \
 			libprotobuf.so:devel/protobuf
 DNSTAP_MESON_ON=	-Ddnstap=enabled
 DNSTAP_MESON_OFF=	-Ddnstap=disabled
 DNSTAP_PLIST_FILES=	lib/knot-resolver/kres_modules/dnstap.so
 
 TESTUNIT_BUILD_DEPENDS=	cmocka>=1.1.1:sysutils/cmocka
 TESTUNIT_MESON_ON=	-Dunit_tests=enabled
 TESTUNIT_MESON_OFF=	-Dunit_tests=disabled
-
-STRIP_TARGETS=	sbin/kres-cache-gc \
-		sbin/kresc \
-		sbin/kresd \
-		lib/knot-resolver/ahocorasick.so \
-		lib/knot-resolver/debug_opensslkeylog.so \
-		lib/knot-resolver/kres_modules/bogus_log.so \
-		lib/knot-resolver/kres_modules/dnstap.so \
-		lib/knot-resolver/kres_modules/edns_keepalive.so \
-		lib/knot-resolver/kres_modules/extended_error.so \
-		lib/knot-resolver/kres_modules/hints.so \
-		lib/knot-resolver/kres_modules/nsid.so \
-		lib/knot-resolver/kres_modules/refuse_nord.so \
-		lib/knot-resolver/kres_modules/stats.so
-
-pre-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${MKDIR} ${STAGEDIR}${RUNDIR}
+TESTUNIT_LDFLAGS=	-pthread
 
 post-install:
+	${MKDIR} ${STAGEDIR}${RUNDIR}
 	${MV} ${STAGEDIR}${ETCDIR}/kresd.conf ${STAGEDIR}${ETCDIR}/kresd.conf.sample
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
-.for STRIP_TGT in ${STRIP_TARGETS}
-	if [ -f ${STAGEDIR}${PREFIX}/${STRIP_TGT} ]; then \
-	  ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${STRIP_TGT}; \
-	fi
-.endfor
 
 .include <bsd.port.mk>
diff --git a/dns/knot-resolver6/distinfo b/dns/knot-resolver6/distinfo
index 4a2301a2c432..4c751f314648 100644
--- a/dns/knot-resolver6/distinfo
+++ b/dns/knot-resolver6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1765271763
-SHA256 (knot-resolver-6.0.17.tar.xz) = 13d4496ef87aeb2fbd3b0057e2211d4585205241e509a0cd4341dbe5e8cb5c1c
-SIZE (knot-resolver-6.0.17.tar.xz) = 2157140
+TIMESTAMP = 1768225823
+SHA256 (knot-resolver-6.1.0.tar.xz) = 7921df7507286d90574bbf5ae664a8a537805ce40b5fa8b15f5d0d33e2c438d0
+SIZE (knot-resolver-6.1.0.tar.xz) = 2158788