Index: misc/Makefile
===================================================================
--- misc/Makefile
+++ misc/Makefile
@@ -155,6 +155,7 @@
     SUBDIR += freebsd-doc-zh_cn
     SUBDIR += freebsd-doc-zh_tw
     SUBDIR += freebsd-release-manifests
+    SUBDIR += freebsd-pkgbase-15-keys
     SUBDIR += freeguide
     SUBDIR += frugally-deep
     SUBDIR += ftdi-eeprom
Index: misc/freebsd-pkgbase-15-keys/Makefile
===================================================================
--- /dev/null
+++ misc/freebsd-pkgbase-15-keys/Makefile
@@ -0,0 +1,26 @@
+PORTNAME=	freebsd-pkgbase-15-keys
+DISTVERSION=	20251128
+CATEGORIES=	misc
+MASTER_SITES=	#
+DISTFILES=	#
+
+MAINTAINER=	re@FreeBSD.org
+COMMENT=	FreeBSD 15.0-RELEASE pkgbase signing and backup keys
+WWW=		https://www.FreeBSD.org
+
+LICENSE=	BSD2CLAUSE
+
+NO_BUILD=	yes
+NO_ARCH=	yes
+
+do-install:
+	@${MKDIR} ${STAGEDIR}/etc/pkg ${STAGEDIR}/usr/share/keys/pkgbase-15/trusted
+	${INSTALL_DATA} ${FILESDIR}/FreeBSD.conf.quarterly-release.sample \
+	    ${STAGEDIR}/etc/pkg/FreeBSD.conf.sample
+	@${MKDIR} ${STAGEDIR}/usr/share/keys/pkgbase-15/trusted
+	${INSTALL_DATA} ${FILESDIR}/pkgbase-15/trusted/awskms-15 \
+	    ${STAGEDIR}/usr/share/keys/pkgbase-15/trusted/
+	${INSTALL_DATA} ${FILESDIR}/pkgbase-15/trusted/backup-signing-15 \
+	    ${STAGEDIR}/usr/share/keys/pkgbase-15/trusted/
+
+.include <bsd.port.mk>
Index: misc/freebsd-pkgbase-15-keys/files/FreeBSD.conf.quarterly-release.sample
===================================================================
--- /dev/null
+++ misc/freebsd-pkgbase-15-keys/files/FreeBSD.conf.quarterly-release.sample
@@ -0,0 +1,32 @@
+#
+# To disable a repository, instead of modifying or removing this file,
+# create a /usr/local/etc/pkg/repos/FreeBSD.conf file, e.g.:
+#
+#   mkdir -p /usr/local/etc/pkg/repos
+#   echo "FreeBSD-ports: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf
+#   echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
+#
+# Note that the FreeBSD-base repository is disabled by default.
+#
+
+FreeBSD-ports: {
+  url: "pkg+https://pkg.FreeBSD.org/${ABI}/quarterly",
+  mirror_type: "srv",
+  signature_type: "fingerprints",
+  fingerprints: "/usr/share/keys/pkg",
+  enabled: yes
+}
+FreeBSD-ports-kmods: {
+  url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_quarterly_${VERSION_MINOR}",
+  mirror_type: "srv",
+  signature_type: "fingerprints",
+  fingerprints: "/usr/share/keys/pkg",
+  enabled: yes
+}
+FreeBSD-base: {
+  url: "pkg+https://pkg.FreeBSD.org/${ABI}/base_release_${VERSION_MINOR}",
+  mirror_type: "srv",
+  signature_type: "fingerprints",
+  fingerprints: "/usr/share/keys/pkgbase-${VERSION_MAJOR}",
+  enabled: no
+}
Index: misc/freebsd-pkgbase-15-keys/files/pkgbase-15/trusted/Makefile
===================================================================
--- /dev/null
+++ misc/freebsd-pkgbase-15-keys/files/pkgbase-15/trusted/Makefile
@@ -0,0 +1,9 @@
+PACKAGE=	pkg-bootstrap
+
+FILES=	awskms-15 \
+	backup-signing-15
+
+FILESDIR=	${SHAREDIR}/keys/pkgbase-15/trusted
+FILESMODE=	644
+
+.include <bsd.prog.mk>
Index: misc/freebsd-pkgbase-15-keys/files/pkgbase-15/trusted/awskms-15
===================================================================
--- /dev/null
+++ misc/freebsd-pkgbase-15-keys/files/pkgbase-15/trusted/awskms-15
@@ -0,0 +1,2 @@
+function: "sha256"
+fingerprint: "1d7b45d20fa8d6ed26f9b4a13ac81a6b5df860b9fe644d07b87e92298ba72595"
Index: misc/freebsd-pkgbase-15-keys/files/pkgbase-15/trusted/backup-signing-15
===================================================================
--- /dev/null
+++ misc/freebsd-pkgbase-15-keys/files/pkgbase-15/trusted/backup-signing-15
@@ -0,0 +1,2 @@
+function: "sha256"
+fingerprint: "56a77bdcb6c3cf7984729c6138bd5617c24aa0d466b3b604c96205b2c5629f3c"
Index: misc/freebsd-pkgbase-15-keys/pkg-descr
===================================================================
--- /dev/null
+++ misc/freebsd-pkgbase-15-keys/pkg-descr
@@ -0,0 +1,10 @@
+FreeBSD pkgbase 15 configuration and signing keys.
+
+Due to recent changes in FreeBSD.org infrastructure, systems running
+15.0-{PRERELEASE,ALPHA*,BETA*} will find that 'pkg upgrade -r FreeBSD-base'
+fails. The https://pkg.freebsd.org/FreeBSD:15:*/base_release_0/ repository
+(which used to contain nightly builds signed with "pkg" keys) has been
+replaced by what was previously on pkgbase.freebsd.org.
+
+This port installs the updated FreeBSD.conf configuration file and the
+pkgbase-15 signing keys needed to access the new repository structure.
Index: misc/freebsd-pkgbase-15-keys/pkg-plist
===================================================================
--- /dev/null
+++ misc/freebsd-pkgbase-15-keys/pkg-plist
@@ -0,0 +1,5 @@
+@preexec mv -fv %D/etc/pkg/FreeBSD.conf %D/etc/pkg/FreeBSD.conf.pkgsave
+@postexec echo "Original FreeBSD.conf backed up to FreeBSD.conf.pkgsave"
+@sample(root,wheel,0644) /etc/pkg/FreeBSD.conf.sample
+@(root,wheel,0644) /usr/share/keys/pkgbase-15/trusted/awskms-15
+@(root,wheel,0644) /usr/share/keys/pkgbase-15/trusted/backup-signing-15