diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile
index 9c4c6b8c67e9..99733d2cd3c6 100644
--- a/dns/unbound/Makefile
+++ b/dns/unbound/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	unbound
-DISTVERSION=	1.16.3
+DISTVERSION=	1.17.0
 CATEGORIES=	dns
-MASTER_SITES=	https://www.nlnetlabs.nl/downloads/unbound/ \
-		https://distfiles.crux.guru/
+MASTER_SITES=	https://www.nlnetlabs.nl/downloads/unbound/
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Validating, recursive, and caching DNS resolver
@@ -35,7 +34,7 @@ PORTDOCS=	CNAME-basedRedirectionDesignNotes.pdf CREDITS Changelog \
 OPTIONS_DEFINE=		DEP-RSA1024 DNSCRYPT DNSTAP DOCS DOH ECDSA EVAPI \
 			FILTER_AAAA GOST HIREDIS LIBEVENT MUNIN_PLUGIN PYTHON \
 			SUBNET TFOCL TFOSE THREADS
-OPTIONS_DEFAULT=	DOH DNSCRYPT ECDSA GOST LIBEVENT THREADS
+OPTIONS_DEFAULT=	DNSCRYPT DOH ECDSA GOST LIBEVENT THREADS
 OPTIONS_SUB=		yes
 
 DEP-RSA1024_DESC=	Deprecate the use of RSA 1024 keys
diff --git a/dns/unbound/distinfo b/dns/unbound/distinfo
index 7c9bf3a7a7ca..f47e8fbfb634 100644
--- a/dns/unbound/distinfo
+++ b/dns/unbound/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1663755234
-SHA256 (unbound-1.16.3.tar.gz) = ea0c6665e2c3325b769eac1dfccd60fe1828d5fcf662650039eccb3f67edb28e
-SIZE (unbound-1.16.3.tar.gz) = 6204330
+TIMESTAMP = 1665654475
+SHA256 (unbound-1.17.0.tar.gz) = dcbc95d7891d9f910c66e4edc9f1f2fde4dea2eec18e3af9f75aed44a02f1341
+SIZE (unbound-1.17.0.tar.gz) = 6235060
diff --git a/dns/unbound/files/unbound.in b/dns/unbound/files/unbound.in
index 0912d2a43d97..f6fc43c80618 100644
--- a/dns/unbound/files/unbound.in
+++ b/dns/unbound/files/unbound.in
@@ -39,7 +39,8 @@ name=unbound
 rcvar=unbound_enable
 
 # setfib
-unbound_startfib() {
+unbound_startfib()
+{
 	${SYSCTL} net.fibs  >/dev/null 2>&1 || return 0
 
 	unbound_fib=${unbound_fib:-"NONE"}
@@ -69,9 +70,9 @@ start_precmd()
 }
 
 # read settings, set default values
-load_rc_config "${name}"
 : ${unbound_enable:="NO"}
 : ${unbound_config:=%%PREFIX%%/etc/unbound/unbound.conf}
+load_rc_config "${name}"
 
 # Set PID file
 pidfile=$(%%PREFIX%%/sbin/unbound-checkconf -o pidfile ${unbound_config})
diff --git a/dns/unbound/pkg-plist b/dns/unbound/pkg-plist
index 58ef3f1362ee..3e99180bdd9b 100644
--- a/dns/unbound/pkg-plist
+++ b/dns/unbound/pkg-plist
@@ -5,7 +5,7 @@ libdata/pkgconfig/libunbound.pc
 lib/libunbound.a
 lib/libunbound.so
 lib/libunbound.so.8
-lib/libunbound.so.8.1.19
+lib/libunbound.so.8.1.20
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py