diff -ruN dns/knot-resolver.orig/distinfo dns/knot-resolver/distinfo
--- dns/knot-resolver.orig/distinfo     2017-02-26 15:17:58.000000000 +0000
+++ dns/knot-resolver/distinfo  2017-06-29 08:40:46.481936000 +0000
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487892509
-SHA256 (knot-resolver-1.2.3.tar.xz) = 81a773f182112b4e11935223f900cfbcca8624f2c382b1e39a68d7c3db81c921
-SIZE (knot-resolver-1.2.3.tar.xz) = 1045548
+TIMESTAMP = 1498699706
+SHA256 (knot-resolver-1.3.1.tar.xz) = cc9631fe1a92628e81e74b324a7f70c0b29840d426de05d7d045fdf85ab01117
+SIZE (knot-resolver-1.3.1.tar.xz) = 1074804
diff -ruN dns/knot-resolver.orig/Makefile dns/knot-resolver/Makefile
--- dns/knot-resolver.orig/Makefile     2017-02-26 15:17:58.000000000 +0000
+++ dns/knot-resolver/Makefile  2017-06-29 15:52:39.695618000 +0000
@@ -2,7 +2,7 @@
 # $FreeBSD: head/dns/knot-resolver/Makefile 434888 2017-02-26 15:17:58Z rm $
 
 PORTNAME=      knot-resolver
-PORTVERSION=   1.2.3
+PORTVERSION=   1.3.1
 CATEGORIES=    dns ipv6
 MASTER_SITES=  https://secure.nic.cz/files/knot-resolver/ \
                https://dns.company/downloads/knot-resolver/
@@ -12,12 +12,11 @@
 
 LICENSE=       GPLv3
 
-LIB_DEPENDS=   libknot.so:dns/knot2 \
+LIB_DEPENDS=   libgnutls.so:security/gnutls \
+               libknot.so:dns/knot2 \
                liblmdb.so:databases/lmdb \
                libluajit-5.1.so:lang/luajit \
-               libuv.so:devel/libuv \
-               libgnutls.so:security/gnutls \
-               libnettle.so:security/nettle
+               libuv.so:devel/libuv
 
 CONFLICTS=     knot-1.* knot1-[0-6].*
 
@@ -27,26 +26,43 @@
 MAKE_ARGS+=    PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig
 MAKE_ARGS+=    lmdb_CFLAGS=-I${PREFIX}/include lmdb_LIBS=-llmdb
 
-USES=          gmake libtool pkgconfig tar:xz
+USES=          gmake libedit libtool pkgconfig tar:xz
 USE_CSTD=      c99
 USE_LDCONFIG=  yes
 
-OPTIONS_DEFINE=                        DOXYGEN MEMCACHED REDIS
-OPTIONS_DEFAULT=
+OPTIONS_DEFINE=                        COOKIES DNSTAP DOXYGEN GO MEMCACHED REDIS STATS
+
+COOKIES_DESC=                  cookies
+COOKIES_LIB_DEPENDS=           libnettle.so:security/nettle
+
+DNSTAP_DESC=                   dnstap support
+DNSTAP_LIB_DEPENDS=            libprotobuf.so:devel/protobuf \
+                               libprotobuf-c.so:devel/protobuf-c \
+                               libfstrm.so:devel/fstrm
+
 DOXYGEN_BUILD_DEPENDS=         doxygen:devel/doxygen
 DOXYGEN_MAKE_ARGS=             HAS_doxygen=yes
 DOXYGEN_MAKE_ARGS_OFF=         HAS_doxygen=no
+
+GO_DESC=                       go
+GO_BUILD_DEPENDS=              go>=1.5:lang/go
+
 MEMCACHED_DESC=                        memcached in-memory data-backend
 MEMCACHED_LIB_DEPENDS=         libmemcached.so:databases/libmemcached
 MEMCACHED_MAKE_ARGS=           HAS_libmemcached=yes
 MEMCACHED_MAKE_ARGS_OFF=       HAS_libmemcached=no
 MEMCACHED_PLIST_FILES=         lib/kdns_modules/kmemcached.so
+
 REDIS_DESC=                    redis in-memory data-backend
 REDIS_LIB_DEPENDS=             libhiredis.so:databases/hiredis
 REDIS_MAKE_ARGS=               HAS_hiredis=yes
 REDIS_MAKE_ARGS_OFF=           HAS_hiredis=no
 REDIS_PLIST_FILES=             lib/kdns_modules/redis.so
 
+STATS_DESC=                    stats
+STATS_BUILD_DEPENDS=           luasocket:net/luasocket \
+                               luasec:security/luasec
+
 USERS=         kresd
 GROUPS=                kresd
 
diff -ruN dns/knot-resolver.orig/pkg-plist dns/knot-resolver/pkg-plist
--- dns/knot-resolver.orig/pkg-plist    2017-02-26 15:17:58.000000000 +0000
+++ dns/knot-resolver/pkg-plist 2017-06-29 08:40:46.466000000 +0000
@@ -66,9 +66,11 @@
 lib/kdns_modules/trust_anchors.lua
 lib/kdns_modules/version.lua
 lib/kdns_modules/view.lua
+lib/kdns_modules/workarounds.lua
 lib/kdns_modules/zonefile.lua
 lib/libkres.so
-lib/libkres.so.2
+lib/libkres.so.3
 libdata/pkgconfig/libkres.pc
 man/man8/kresd.8.gz
+sbin/kresc
 sbin/kresd