diff -ruN dns/knot2.orig/distinfo dns/knot2/distinfo
--- dns/knot2.orig/distinfo     2017-06-19 11:34:37.157160000 +0000
+++ dns/knot2/distinfo  2017-06-19 11:39:57.682352000 +0000
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493403989
-SHA256 (knot-2.4.3.tar.xz) = f90258bcb29c1f351cd8d824ff8d67aef906ae5d5ff0f652c4f69c69ed8a704f
-SIZE (knot-2.4.3.tar.xz) = 1110588
+TIMESTAMP = 1496870306
+SHA256 (knot-2.5.1.tar.xz) = 6c08cdc0a0182e262136b936a968ad667abce112195d99c27e50ea22afc08398
+SIZE (knot-2.5.1.tar.xz) = 1070108
diff -ruN dns/knot2.orig/files/patch-src_utils_pykeymgr_pykeymgr.in dns/knot2/files/patch-src_utils_pykeymgr_pykeymgr.in
--- dns/knot2.orig/files/patch-src_utils_pykeymgr_pykeymgr.in   1970-01-01 00:00:00.000000000 +0000
+++ dns/knot2/files/patch-src_utils_pykeymgr_pykeymgr.in        2017-06-19 11:39:57.703215000 +0000
@@ -0,0 +1,8 @@
+--- src/utils/pykeymgr/pykeymgr.in.orig        2017-06-15 11:53:10 UTC
++++ src/utils/pykeymgr/pykeymgr.in
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/local/bin/python3
+ # vim: et ts=4 sw=4 sts=4
+ #
+ # Manipulate LMDB-beckended KASP database (import from obsolete JSON KASP, list, modify...).
diff -ruN dns/knot2.orig/files/pkg-message.in dns/knot2/files/pkg-message.in
--- dns/knot2.orig/files/pkg-message.in 2017-06-19 11:34:37.154155000 +0000
+++ dns/knot2/files/pkg-message.in      2017-06-19 11:39:57.705176000 +0000
@@ -12,7 +12,7 @@
 ######################################################################
 
   Please consult the documentation:
-   - man knot.conf
+   - man knotd
    - https://www.knot-dns.cz/documentation/
 
 ######################################################################
diff -ruN dns/knot2.orig/Makefile dns/knot2/Makefile
--- dns/knot2.orig/Makefile     2017-06-19 11:34:37.156124000 +0000
+++ dns/knot2/Makefile  2017-06-19 11:39:57.683110000 +0000
@@ -2,7 +2,7 @@
 # $FreeBSD: head/dns/knot2/Makefile 439773 2017-04-29 20:28:55Z pi $
 
 PORTNAME=      knot
-PORTVERSION=   2.4.3
+PORTVERSION=   2.5.1
 CATEGORIES=    dns ipv6
 MASTER_SITES=  https://secure.nic.cz/files/knot-dns/ \
                http://dns-lab.com/downloads/knot-dns/
@@ -13,18 +13,15 @@
 
 LICENSE=       GPLv3
 
-LIB_DEPENDS=   libfstrm.so:devel/fstrm \
-               libgnutls.so:security/gnutls \
-               libjansson.so:devel/jansson \
+LIB_DEPENDS=   libgnutls.so:security/gnutls \
                liblmdb.so:databases/lmdb \
-               libnettle.so:security/nettle \
                liburcu.so:sysutils/liburcu
 
 CONFLICTS=     knot-1.* knot1-[0-6].*
 
-USES=          alias compiler:c11 libedit libtool pkgconfig tar:xz
+USES=          autoreconf alias compiler:c11 libedit libtool localbase pkgconfig python shebangfix tar:xz
+USE_GCC=       4.8+
 USE_LDCONFIG=  yes
-
 GNU_CONFIGURE= yes
 CONFIGURE_ARGS=        --with-rundir=/var/run/knot \
                --with-storage=/var/db/knot \
@@ -42,11 +39,14 @@
 
 PORTDOCS=      AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
 
+BROKEN_i386=   Issues in knot/modules/*/*.c: undefined reference to `__atomic_fetch_add_8'
+
 OPTIONS_DEFINE=                        DNSTAP FASTPARSER IDN
 
 DNSTAP_DESC=                   dnstap support (see dnstap.info)
 DNSTAP_CONFIGURE_ENABLE=       dnstap
-DNSTAP_LIB_DEPENDS=            libprotobuf-c.so:devel/protobuf-c
+DNSTAP_LIB_DEPENDS=            libprotobuf-c.so:devel/protobuf-c \
+                               libfstrm.so:devel/fstrm
 # 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
@@ -60,6 +60,9 @@
 IDN_CONFIGURE_WITH=            libidn
 IDN_LIB_DEPENDS=               libidn.so:dns/libidn
 
+pre-configure:
+       @cd ${WRKSRC} && ${AUTORECONF} -f -i
+
 post-patch:
        @${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
                ${WRKSRC}/src/Makefile.in
diff -ruN dns/knot2.orig/pkg-plist dns/knot2/pkg-plist
--- dns/knot2.orig/pkg-plist    2017-06-19 11:34:37.152281000 +0000
+++ dns/knot2/pkg-plist 2017-06-19 11:40:29.538851000 +0000
@@ -10,20 +10,17 @@
 include/dnssec/crypto.h
 include/dnssec/dnssec.h
 include/dnssec/error.h
-include/dnssec/event.h
-include/dnssec/kasp.h
 include/dnssec/key.h
 include/dnssec/keyid.h
-include/dnssec/keystate.h
 include/dnssec/keystore.h
 include/dnssec/keytag.h
-include/dnssec/keyusage.h
 include/dnssec/list.h
 include/dnssec/nsec.h
 include/dnssec/random.h
 include/dnssec/sign.h
 include/dnssec/tsig.h
 include/dnssec/version.h
+include/knot/module.h
 include/libknot/attribute.h
 include/libknot/binary.h
 include/libknot/codes.h
@@ -67,29 +64,32 @@
 include/libknot/tsig-op.h
 include/libknot/tsig.h
 include/libknot/version.h
+include/libknot/yparser/yparser.h
+include/libknot/yparser/ypformat.h
+include/libknot/yparser/ypschema.h
+include/libknot/yparser/yptrafo.h
 include/zscanner/error.h
 include/zscanner/scanner.h
 include/zscanner/version.h
 lib/libdnssec.a
 lib/libdnssec.so
-lib/libdnssec.so.2
-lib/libdnssec.so.2.1.0
+lib/libdnssec.so.4
+lib/libdnssec.so.4.0.0
 lib/libknot.a
 lib/libknot.so
-lib/libknot.so.5
-lib/libknot.so.5.0.0
+lib/libknot.so.6
+lib/libknot.so.6.0.0
 lib/libzscanner.a
 lib/libzscanner.so
 lib/libzscanner.so.1
 lib/libzscanner.so.1.0.0
+libdata/pkgconfig/knotd.pc
 libdata/pkgconfig/libdnssec.pc
 libdata/pkgconfig/libknot.pc
 libdata/pkgconfig/libzscanner.pc
-libexec/knot1to2
 man/man1/kdig.1.gz
 man/man1/khost.1.gz
 man/man1/kjournalprint.1.gz
-man/man1/knot1to2.1.gz
 man/man1/knsec3hash.1.gz
 man/man1/knsupdate.1.gz
 man/man1/kzonecheck.1.gz
@@ -97,6 +97,10 @@
 man/man8/keymgr.8.gz
 man/man8/knotc.8.gz
 man/man8/knotd.8.gz
+man/man8/pykeymgr.8.gz
 sbin/keymgr
 sbin/knotc
 sbin/knotd
+sbin/pykeymgr
+@dir /var/db/knot
+@dir /var/run/knot