diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile
index 694ae64acba0..e6a1ea119a18 100644
--- a/dns/knot-resolver/Makefile
+++ b/dns/knot-resolver/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	knot-resolver
 DISTVERSION=	3.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
 		https://dns.company/downloads/knot-resolver/
@@ -40,7 +40,7 @@ OPTIONS_DEFINE=	DOCS DNSTAP DOXYGEN GO TRUSTANCHOR
 # COOKIES will come return/reworked to reflect IETF dnsop group development
 #COOKIES_DESC=			cookies
 #COOKIES_LIB_DEPENDS=		libnettle.so:security/nettle
-#COOKIES_MAKE_ARGS_ON=		HAS_nettle=yes
+#COOKIES_MAKE_ARGS=		HAS_nettle=yes
 #COOKIES_MAKE_ARGS_OFF=		HAS_nettle=no
 #COOKIES_PLIST_FILES=		lib/kdns_modules/cookies.so      \
 #				include/libkres/alg_containers.h \
@@ -54,23 +54,23 @@ DNSTAP_DESC=			dnstap support
 DNSTAP_LIB_DEPENDS=		libprotobuf.so:devel/protobuf \
 				libprotobuf-c.so:devel/protobuf-c \
 				libfstrm.so:devel/fstrm
-DNSTAP_MAKE_ARGS_ON=		HAS_libprotobuf-c=yes HAS_libfstrm=yes
+DNSTAP_MAKE_ARGS=		HAS_libprotobuf-c=yes HAS_libfstrm=yes
 DNSTAP_MAKE_ARGS_OFF=		HAS_libprotobuf-c=no  HAS_libfstrm=no
 DNSTAP_PLIST_FILES=		lib/kdns_modules/dnstap.so
 
 DOXYGEN_IMPLIES=		DOCS
 DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
-DOXYGEN_MAKE_ARGS_ON=		HAS_doxygen=yes
+DOXYGEN_MAKE_ARGS=		HAS_doxygen=yes
 DOXYGEN_MAKE_ARGS_OFF=		HAS_doxygen=no
 
 GO_DESC=			go
 GO_BUILD_DEPENDS=		go>=1.5:lang/go
-GO_MAKE_ARGS_ON=		HAS_go=yes
+GO_MAKE_ARGS=			HAS_go=yes
 GO_MAKE_ARGS_OFF=		HAS_go=no
 
 TRUSTANCHOR_DESC=		Trust anchor bootstrapping and stats
 TRUSTANCHOR_USES=		lua
-TRUSTANCHOR_MAKE_ARGS_ON=	HAS_ltn12=yes HAS_ssl.https=yes
+TRUSTANCHOR_MAKE_ARGS=		HAS_ltn12=yes HAS_ssl.https=yes
 TRUSTANCHOR_MAKE_ARGS_OFF=	HAS_ltn12=no  HAS_ssl.https=no
 TRUSTANCHOR_BUILD_DEPENDS=	${LUA_PKGNAMEPREFIX}luasocket>=0:net/luasocket \
 				${LUA_PKGNAMEPREFIX}luasec>=0:security/luasec