PDATING
index 4b14159ceb4a..d18aaeb2fd46 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,14 @@ Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before updating system packages
 and/or ports.
 
+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.
+
 20251001:
 	The deprecated ftpd(8) has been removed.  Users who still need ftpd
 	can install the ftp/freebsd-ftpd port.  pkgbase users should remove
diff --git a/etc/Makefile b/etc/Makefile
index 93d4b489ec7d..bda70b8af391 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -68,7 +68,7 @@ distribution:
 # 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
index b3372196f5f9..b55c0150848e 100644
--- 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
index e2cd25ea8b34..1a31e50e6416 100644
--- 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 @@ UNBOUNDDIR= ${SRCTOP}/contrib/unbound
 # 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
index 093da31ed787..3b7f45e8f101 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -294,7 +294,7 @@ SSHPACKAGE=			ssh
 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
similarity index 100%
rename from release/packages/ucl/unbound-all.ucl
rename to release/packages/ucl/local-unbound-all.ucl
diff --git a/release/packages/ucl/local-unbound.ucl b/release/packages/ucl/local-unbound.ucl
new file mode 100644
index 000000000000..0f1c77a0d0ee
--- /dev/null
+++ b/release/packages/ucl/local-unbound.ucl
@@ -0,0 +1,27 @@
+/*
+ * SPDX-License-Identifier: ISC
+ *
+ * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+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
index a28e388e47c0..84dfdbf736bd 100644
--- 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-//}