diff --git a/UPDATING b/UPDATING
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,14 @@
 	world, or to merely disable the most expensive debugging functionality
 	at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20251015:
+	The "FreeBSD-unbound" package is renamed to "FreeBSD-local-unbound".
+	If you have set-optional or set-base installed, the new package will
+	be installed automatically, otherwise you should manually install the
+	new package and remove the old one.
+
+	This change only affects pkgbase users.
+
 20251012:
 	Blacklist has been renamed upstream to Blocklist.  If you have it
 	configured, rename all configuration files, firewall anchors or
diff --git a/etc/Makefile b/etc/Makefile
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -68,7 +68,7 @@
 # install the /etc/unbound symlink, otherwise, don't overwrite the user's
 # existing symlink.
 	if [ "${NO_ROOT:Dtrue}" = true -o ! -e ${DESTDIR}/etc/unbound ]; then \
-		${INSTALL_SYMLINK} -Tpackage=unbound ../var/unbound \
+		${INSTALL_SYMLINK} -Tpackage=local-unbound ../var/unbound \
 			${DESTDIR}/etc/unbound; \
 	fi
 .endif
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -104,8 +104,8 @@
         vi.recover      mode=01777
         ..
     ..
-    unbound         uname=unbound gname=unbound mode=0755 tags=package=unbound
-        conf.d          uname=unbound gname=unbound mode=0755 tags=package=unbound
+    unbound         uname=unbound gname=unbound mode=0755 tags=package=local-unbound
+        conf.d          uname=unbound gname=unbound mode=0755 tags=package=local-unbound
         ..
     ..
     yp
diff --git a/lib/libunbound/Makefile b/lib/libunbound/Makefile
--- a/lib/libunbound/Makefile
+++ b/lib/libunbound/Makefile
@@ -1,4 +1,3 @@
-PACKAGE=lib${LIB}
 # Vendor sources and generated files
 LDNSDIR= ${SRCTOP}/contrib/ldns
 UNBOUNDDIR= ${SRCTOP}/contrib/unbound
@@ -6,9 +5,10 @@
 # Hold my beer and watch this
 .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/cachedb ${UNBOUNDDIR}/dns64 ${UNBOUNDDIR}/iterator ${UNBOUNDDIR}/sldns ${UNBOUNDDIR}/libunbound ${UNBOUNDDIR}/services ${UNBOUNDDIR}/services/cache ${UNBOUNDDIR}/util ${UNBOUNDDIR}/util/data ${UNBOUNDDIR}/respip ${UNBOUNDDIR}/util/storage ${UNBOUNDDIR}/validator 
 
-LIB=	unbound
+PACKAGE=	local-unbound
+
+LIB=		unbound
 PRIVATELIB=
-PACKAGE=	unbound
 
 CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR} -I${.CURDIR}
 CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -294,7 +294,7 @@
 SSH=		sshd
 
 CONFGROUPS.${MK_UNBOUND}+=	UNBOUND
-UNBOUNDPACKAGE=			unbound
+UNBOUNDPACKAGE=			local-unbound
 UNBOUND=	local_unbound
 
 CONFGROUPS.${MK_VI}+=		VI
diff --git a/release/packages/ucl/unbound-all.ucl b/release/packages/ucl/local-unbound-all.ucl
rename from release/packages/ucl/unbound-all.ucl
rename to release/packages/ucl/local-unbound-all.ucl
diff --git a/release/packages/ucl/unbound-all.ucl b/release/packages/ucl/local-unbound.ucl
rename from release/packages/ucl/unbound-all.ucl
rename to release/packages/ucl/local-unbound.ucl
--- a/release/packages/ucl/unbound-all.ucl
+++ b/release/packages/ucl/local-unbound.ucl
@@ -16,20 +16,12 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-comment = "NLnet Labs Unbound DNS resolver"
-
-desc = <<EOD
-Unbound is a caching, DNSSEC-validating DNS resolver developed by NLnet Labs.
-This version of Unbound, called local-unbound, is intended to service DNS
-requests from services running on the local system, and is typically started
-via the local_unbound rc(8) service.
-
-A full-featured version of Unbound is available in the FreeBSD Ports Collection
-as "dns/unbound".
-EOD
-
-licenses = [ BSD4CLAUSE ]
-
-annotations {
-	set = "optional,optional-jail"
-}
+messages = [
+	{
+		type: upgrade
+		message: <<EOM
+After upgrading local-unbound, the configuration file should be regenerated
+by running "service local_unbound setup" before restarting the service.
+EOM
+	}
+]
diff --git a/usr.sbin/unbound/Makefile.inc b/usr.sbin/unbound/Makefile.inc
--- a/usr.sbin/unbound/Makefile.inc
+++ b/usr.sbin/unbound/Makefile.inc
@@ -1,6 +1,6 @@
 MK_WERROR=	no
 NO_WTHREAD_SAFETY= true
-PACKAGE=	unbound
+PACKAGE=	local-unbound
 
 .for man in ${MAN}
 ${man}: ${UNBOUNDDIR}/doc/${man:S/local-//}