diff --git a/dns/dnsdist/Makefile b/dns/dnsdist/Makefile
index 23b3a9d6f039..0e0808d33ef1 100644
--- a/dns/dnsdist/Makefile
+++ b/dns/dnsdist/Makefile
@@ -1,94 +1,94 @@
 # Created by: Carlos J Puga Medina <cpm@fbsd.es>
 
 PORTNAME=	dnsdist
-DISTVERSION=	1.5.1
-PORTREVISION=	4
+DISTVERSION=	1.6.0
 CATEGORIES=	dns net
 MASTER_SITES=	https://downloads.powerdns.com/releases/
 
 MAINTAINER=	tremere@cainites.net
-COMMENT=	Highly DNS-, DoS-, and abuse-aware load balancer
+COMMENT=	Highly DNS-, DoS- and abuse-aware loadbalancer
 
-LICENSE=	GPLv2 UNLICENSE
+LICENSE=	GPLv2 ISCL MIT
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
-LICENSE_FILE_UNLICENSE=	${WRKSRC}/ext/incbin/UNLICENSE
+LICENSE_FILE_ISCL=	${WRKSRC}/ext/ipcrypt/LICENSE
+LICENSE_FILE_MIT=	${WRKSRC}/ext/yahttp/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
 LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
 		libh2o-evloop.so:www/h2o \
 		libprotobuf.so:devel/protobuf \
 		libre2.so:devel/re2 \
 		libsodium.so:security/libsodium
 
 USES=		bison:alias compiler:c++14-lang cpe gmake libedit libtool \
 		localbase pkgconfig tar:bz2
 USE_RC_SUBR=	dnsdist
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin \
 		--enable-dns-over-https \
 		--enable-dns-over-tls \
 		--enable-dnscrypt \
 		--sysconfdir=${ETCDIR} \
 		--with-libsodium \
 		--with-re2
 
 INSTALL_TARGET=	install-strip
 
 USERS=		_dnsdist
 GROUPS=		_dnsdist
 
 OPTIONS_DEFINE=		DNSTAP SNMP
 OPTIONS_DEFAULT=	CDB GNUTLS LMDB LUA OPENSSL
 OPTIONS_GROUP=		KSVOPT
 OPTIONS_GROUP_KSVOPT=	CDB LMDB
 OPTIONS_MULTI=		TLS
 OPTIONS_MULTI_TLS=	GNUTLS OPENSSL
 OPTIONS_SINGLE=		EXTLUA
 OPTIONS_SINGLE_EXTLUA=	LUA LUAJIT LUAJITOR
 
 CDB_DESC=	CDB backend
 DNSTAP_DESC=	dnstap support (see dnstap.info)
 KSVOPT_DESC=	Key Value Stores
 LMDB_DESC=	LMDB backend
 LUAJITOR_DESC=	Use lang/luajit-openresty
 LUAJIT_DESC=	Use lang/luajit
 LUA_DESC=	Use lang/lua
 
 CDB_LIB_DEPENDS=	libcdb.so:databases/tinycdb
 CDB_CONFIGURE_ON=	CDB_CFLAGS="-I${LOCALBASE}/include" \
 			CDB_LIBS="-L${LOCALBASE}/lib -lcdb"
 
 DNSTAP_LIB_DEPENDS=		libfstrm.so:devel/fstrm
 DNSTAP_CONFIGURE_ENABLE=	fstrm
 
 GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ENABLE=	gnutls
 
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 LMDB_CONFIGURE_ON=	--with-lmdb=${LOCALBASE}
 LMDB_CONFIGURE_OFF=	--without-lmdb
 
 LUAJITOR_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
 LUAJITOR_CONFIGURE_ON=	--with-lua=luajit
 
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 LUAJIT_CONFIGURE_ON=	--with-lua=luajit
 
 LUA_USES=		lua
 LUA_CONFIGURE_ON=	--with-lua=lua-${LUA_VER}
 
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ON=	LIBSSL_CFLAGS=-I${OPENSSLINC} \
 			LIBSSL_LIBS="-L${OPENSSLLIB} -lssl"
 OPENSSL_CONFIGURE_WITH=	libssl
 
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_WITH=	net-snmp
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/dnsdist.conf.sample ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
diff --git a/dns/dnsdist/distinfo b/dns/dnsdist/distinfo
index ffbc5bb8a933..44d121803a94 100644
--- a/dns/dnsdist/distinfo
+++ b/dns/dnsdist/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601542484
-SHA256 (dnsdist-1.5.1.tar.bz2) = cae759729a87703f4d09b0ed4227cb224aaaa252fa92f2432fd7116f560afbf1
-SIZE (dnsdist-1.5.1.tar.bz2) = 1068061
+TIMESTAMP = 1620725957
+SHA256 (dnsdist-1.6.0.tar.bz2) = a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+SIZE (dnsdist-1.6.0.tar.bz2) = 1328707
diff --git a/dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp b/dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp
deleted file mode 100644
index 90c376cb7e70..000000000000
--- a/dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- ext/luawrapper/include/LuaContext.hpp.orig	2018-11-12 08:33:58 UTC
-+++ ext/luawrapper/include/LuaContext.hpp
-@@ -2649,11 +2649,21 @@ struct LuaContext::Reader<std::string>
-     static auto read(lua_State* state, int index)
-         -> boost::optional<std::string>
-     {
-+        std::string result;
-+
-+        // lua_tolstring might convert the variable that would confuse lua_next, so we
-+        //   make a copy of the variable.
-+        lua_pushvalue(state, index);
-+
-         size_t len;
--        const auto val = lua_tolstring(state, index, &len);
--        if (val == 0)
--            return boost::none;
--        return std::string(val, len);
-+        const auto val = lua_tolstring(state, -1, &len);
-+
-+        if (val != 0)
-+          result.assign(val, len);
-+
-+        lua_pop(state, 1);
-+
-+        return val != 0 ? boost::optional<std::string>{ std::move(result) } : boost::none;
-     }
- };
-