diff --git a/etc/Makefile b/etc/Makefile
index ae52d791324d..ddd1abbffbfb 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -250,6 +250,11 @@ distribution:
 .if ${MK_BIND_ETC} != "no"
 	${_+_}cd ${.CURDIR}/namedb; ${MAKE} install
 .endif
+.if ${MK_UNBOUND} != "no"
+	if [ ! -e ${DESTDIR}/etc/unbound ]; then \
+		${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \
+	fi
+.endif
 .if ${MK_SENDMAIL} != "no"
 	${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution
 .endif
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 349db40673f0..352ac216803f 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -66,8 +66,6 @@
         ..
         ssl
         ..
-        unbound
-        ..
         zfs
         ..
     ..