diff -ruN /usr/ports/dns/knot/Makefile dns/knot/Makefile
--- /usr/ports/dns/knot/Makefile	2015-03-13 20:04:21.000000000 +0000
+++ dns/knot/Makefile	2015-04-10 15:12:57.488832379 +0000
@@ -2,7 +2,7 @@
 # $FreeBSD: head/dns/knot/Makefile 381230 2015-03-13 20:04:21Z pawel $
 
 PORTNAME=	knot
-PORTVERSION=	1.6.2
+PORTVERSION=	1.6.3
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
 		http://dns-lab.com/downloads/knot-dns/
@@ -20,9 +20,6 @@
 
 USE_LDCONFIG=	yes
 
-USE_OPENSSL=		yes
-WITH_OPENSSL_PORT=	yes
-
 INSTALL_TARGET=	install-strip
 
 GNU_CONFIGURE=	yes
@@ -30,15 +27,48 @@
 CONFIGURE_ARGS+=	--with-storage=/var/db/knot
 CONFIGURE_ARGS+=	--with-rundir=/var/run/knot
 
-OPTIONS_DEFINE=	FASTPARSER IDNA
+OPTIONS_DEFINE=		DNSTAP FASTPARSER GOST IDNA LMDB
+OPTIONS_SINGLE=		SSL
+OPTIONS_SINGLE_SSL=	LIBRESSL OPENSSL
+OPTIONS_DEFAULT=	GOST OPENSSL
+
+DNSTAP_DESC=		dnstap support (see dnstap.info)
+DNSTAP_CONFIGURE_ENABLE=	dnstap
+DNSTAP_LIB_DEPENDS=	libfstrm.so:${PORTSDIR}/devel/fstrm \
+			libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
 
+FASTPARSER_DESC=	Fast zone parser (demanding compilation)
 FASTPARSER_CONFIGURE_ENABLE=	fastparser
-FASTPARSER_DESC=		Fast zone parser (demanding compilation)
 
-IDNA_CONFIGURE_WITH=	libidn
+GOST_DESC=		Enable GOST ciphers (requires OpenSSL >= 1.0.0)
+
 IDNA_DESC=		IDN support in knot utilities
+IDNA_CONFIGURE_WITH=	libidn
 IDNA_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
 
+LMDB_DESC=		LMDB backend
+LMDB_CONFIGURE_ENABLE=	lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
+
+SSL_DESC=		DNSSEC support using:
+
+LIBRESSL_DESC=		LibreSSL (experimental)
+LIBRESSL_LIB_DEPENDS=	libressl.so:${PORTSDIR}/security/libressl
+
+OPENSSL_DESC=		OpenSSL (default)
+OPENSSL_USE=		OPENSSL=yes
+OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MLIBRESSL} && ${PORT_OPTIONS:MGOST}
+IGNORE=			the (not impossible) combination of LibreSSL and GOST is not implemented (yet). Either disable GOST or use OpenSSL
+.endif
+
+.if ${PORT_OPTIONS:MOPENSSL} && ${PORT_OPTIONS:MGOST} && ${OSVERSION} < 1000015
+WITH_OPENSSL_PORT=	yes
+.endif
+
 SUB_FILES=	pkg-message
 
 USE_RC_SUBR=	${PORTNAME}
diff -ruN /usr/ports/dns/knot/distinfo dns/knot/distinfo
--- /usr/ports/dns/knot/distinfo	2015-03-13 20:04:21.000000000 +0000
+++ dns/knot/distinfo	2015-04-10 13:53:11.011113842 +0000
@@ -1,2 +1,2 @@
-SHA256 (knot-1.6.2.tar.xz) = 01fe0ae8081992c8b378045e31a2d03452d0ae6d8afaa1905fd767f7e2376ad4
-SIZE (knot-1.6.2.tar.xz) = 782416
+SHA256 (knot-1.6.3.tar.xz) = 48da608e29c2c1ef5937eb692f8ef0462ebb50fa7d128478a23e0a9788533e86
+SIZE (knot-1.6.3.tar.xz) = 785052
diff -ruN /usr/ports/dns/knot/files/patch-src_libknot_dnssec_config.h dns/knot/files/patch-src_libknot_dnssec_config.h
--- /usr/ports/dns/knot/files/patch-src_libknot_dnssec_config.h	1970-01-01 00:00:00.000000000 +0000
+++ dns/knot/files/patch-src_libknot_dnssec_config.h	2015-04-10 14:18:05.633946353 +0000
@@ -0,0 +1,11 @@
+--- src/libknot/dnssec/config.h.orig	2015-02-19 09:43:56 UTC
++++ src/libknot/dnssec/config.h
+@@ -40,7 +40,7 @@
+   #undef KNOT_ENABLE_ECDSA
+ #endif
+ 
+-#if !defined(OPENSSL_NO_GOST) && OPENSSL_VERSION_NUMBER >= 0x1000001fL
++#if !defined(OPENSSL_NO_GOST) && OPENSSL_VERSION_NUMBER >= 0x1000001fL && !defined(LIBRESSL_VERSION_NUMBER)
+   #define KNOT_ENABLE_GOST 1
+ #else
+   #undef KNOT_ENABLE_GOST
diff -ruN /usr/ports/dns/knot/files/pkg-message.in dns/knot/files/pkg-message.in
--- /usr/ports/dns/knot/files/pkg-message.in	2014-02-13 13:26:03.000000000 +0000
+++ dns/knot/files/pkg-message.in	2015-04-10 14:03:17.522030174 +0000
@@ -1,6 +1,6 @@
 ####################################################################
 #
-# To start using Knot DNS, you should complete the following tasks:
+# Complete the following tasks to start using Knot DNS:
 #
 # cp %%ETCDIR%%/knot.sample.conf %%ETCDIR%%/knot.conf
 # $EDITOR %%ETCDIR%%/knot.conf