Index: Makefile
===================================================================
--- Makefile	(revision 439368)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	unbound
-PORTVERSION=	1.6.1
+PORTVERSION=	1.6.2
 CATEGORIES=	dns
 MASTER_SITES=	http://unbound.net/downloads/
 
@@ -32,7 +32,8 @@
 		ietf67-design-02.pdf requirements.txt
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	THREADS PYTHON GOST ECDSA MUNIN_PLUGIN DOCS LIBEVENT FILTER_AAAA DNSTAP
+OPTIONS_DEFINE=	THREADS PYTHON GOST ECDSA MUNIN_PLUGIN DOCS LIBEVENT \
+		FILTER_AAAA DNSTAP DNSCRYPT SUBNET EVAPI TFOCL TFOSE
 OPTIONS_DEFAULT=THREADS ECDSA
 
 LIBEVENT_DESC=	Build against libevent
@@ -41,6 +42,11 @@
 MUNIN_PLUGIN_DESC=	Install Munin plugin
 FILTER_AAAA_DESC=	Build with AAAA filter functionality (contrib)
 DNSTAP_DESC=	Enable dnstap logging support
+DNSCRYPT_DESC=	Enable dnscryot support
+SUBNET_DESC=	Enable client subnet support
+EVAPI_DESC=	(Experimental) pluggable event based libunbound API support
+TFOCL_DESC=	Enable TCP Fast Open for client mode
+TFOSE_DESC=	Enable TCP Fast Open for server mode
 
 STRIP_FILES=	.libs/libunbound.so unbound-checkconf unbound \
 		unbound-control .libs/unbound-host .libs/unbound-anchor
@@ -48,6 +54,12 @@
 DNSTAP_CONFIGURE_ENABLE=dnstap
 DNSTAP_LIB_DEPENDS=	libfstrm.so:devel/fstrm \
 			libprotobuf-c.so:devel/protobuf-c
+DNSCRYPT_CONFIGURE_ENABLE=	dnscrypt
+DNSCRYPT_LIB_DEPENDS=	libsodium.so:security/libsodium
+SUBNET_CONFIGURE_ENABLE=	subnet
+EVAPI_CONFIGURE_ENABLE=	event-api
+TFOCL_CONFIGURE_ENABLE=	tfo-client
+TFOSE_CONFIGURE_ENABLE=	tfo-server
 ECDSA_CONFIGURE_ENABLE=	ecdsa
 ECDSA_VARS=		DEPENDS_ARGS+=WITH_ECDSA=yes
 GOST_CONFIGURE_ENABLE=	gost
@@ -58,8 +70,10 @@
 LIBEVENT_LDFLAGS+=	$$(pkg-config libevent --libs-only-L)
 LIBEVENT_USES=		pkgconfig
 MUNIN_PLUGIN_SUB_FILES=	pkg-message
-PYTHON_BUILD_DEPENDS=	swig:devel/swig30
-PYTHON_CONFIGURE_ON=	--with-pyunbound=yes --with-pythonmodule=yes LDFLAGS="-L${LOCALBASE}/lib"
+PYTHON_BUILD_DEPENDS=	swig3.0:devel/swig30
+PYTHON_CONFIGURE_ON=	--with-pyunbound=yes --with-pythonmodule=yes \
+			LDFLAGS="-L${LOCALBASE}/lib" \
+			ac_cv_path_SWIG=${LOCALBASE}/bin/swig3.0
 PYTHON_USES=		python:2
 PYTHON_VARS=		STRIP_FILES+=.libs/_unbound.so
 THREADS_CONFIGURE_WITH=	pthreads
Index: distinfo
===================================================================
--- distinfo	(revision 439368)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487712193
-SHA256 (unbound-1.6.1.tar.gz) = 42df63f743c0fe8424aeafcf003ad4b880b46c14149d696057313f5c1ef51400
-SIZE (unbound-1.6.1.tar.gz) = 5074713
+TIMESTAMP = 1493038416
+SHA256 (unbound-1.6.2.tar.gz) = 1a323d72c32180b7141c9e6ebf199fc68a0208dfebad4640cd2c4c27235e3b9c
+SIZE (unbound-1.6.2.tar.gz) = 5378826
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 439368)
+++ pkg-plist	(working copy)
@@ -1,9 +1,10 @@
 @sample %%ETCDIR%%/unbound.conf.sample
 include/unbound.h
+%%EVAPI%%include/unbound-event.h
 lib/libunbound.a
 lib/libunbound.so
 lib/libunbound.so.2
-lib/libunbound.so.2.4.4
+lib/libunbound.so.2.5.1
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py