diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index e425d22172..8292fde7da 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -1060,6 +1060,7 @@ clone_to_staging_area() {
 		-X ${_exclude_files} \
 		.
 
+	core_pkg_create rc "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR}
 	core_pkg_create base "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR}
 	core_pkg_create base-nanobsd "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR}
 	core_pkg_create default-config "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR}
@@ -1119,6 +1120,8 @@ customize_stagearea_for_image() {
 	# Prepare final stage area
 	create_final_staging_area
 
+	pkg_chroot_add ${FINAL_CHROOT_DIR} rc
+
 	if [ "${1}" = "nanobsd" -o \
 	     "${1}" = "nanobsd-vga" ]; then
 
diff --git a/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST b/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST
index f163b921b8..b1a31a7af3 100644
--- a/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST
+++ b/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST
@@ -7,7 +7,7 @@ EOD
 maintainer: development@pfsense.org
 prefix: /usr/local
 deps: {
-
+"%%PRODUCT_NAME%%-rc": {origin: "security/%%PRODUCT_NAME%%-rc", version: "%%VERSION%%"}
 }
 categories [ security,  ]
 licenselogic: single
diff --git a/tools/templates/core_pkg/base/metadir/+MANIFEST b/tools/templates/core_pkg/base/metadir/+MANIFEST
index 94b2057c7f..0f5ed85129 100644
--- a/tools/templates/core_pkg/base/metadir/+MANIFEST
+++ b/tools/templates/core_pkg/base/metadir/+MANIFEST
@@ -7,7 +7,7 @@ EOD
 maintainer: development@pfsense.org
 prefix: /usr/local
 deps: {
-
+"%%PRODUCT_NAME%%-rc": {origin: "security/%%PRODUCT_NAME%%-rc", version: "%%VERSION%%"}
 }
 categories [ security,  ]
 licenselogic: single
diff --git a/tools/templates/core_pkg/kernel/metadir/+MANIFEST b/tools/templates/core_pkg/kernel/metadir/+MANIFEST
index 1770333b41..5c87a6a2ee 100644
--- a/tools/templates/core_pkg/kernel/metadir/+MANIFEST
+++ b/tools/templates/core_pkg/kernel/metadir/+MANIFEST
@@ -7,7 +7,7 @@ EOD
 maintainer: development@pfsense.org
 prefix: /
 deps: {
-
+"%%PRODUCT_NAME%%-rc": {origin: "security/%%PRODUCT_NAME%%-rc", version: "%%VERSION%%"}
 }
 categories [ security,  ]
 licenselogic: single