diff --git a/Makefile.inc1 b/Makefile.inc1
index ed9388610f17..74a3b84081d0 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1618,7 +1618,10 @@ create-world-package-${pkgname}: .PHONY
 	@awk -F\" ' \
 		/^name/ { printf("===> Creating %s-", $$2); next } \
 		/^version/ { print $$2; next } \
-		' ${WSTAGEDIR}/${pkgname}.ucl ; \
+		' ${WSTAGEDIR}/${pkgname}.ucl ;
+	@if [ "${pkgname}" == "runtime" ]; then \
+		sed -i '' -e "s/%KERNCONF%/${INSTALLKERNEL:tl}/" ${WSTAGEDIR}/${pkgname}.ucl ; \
+	fi
 	${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
 		create -M ${WSTAGEDIR}/${pkgname}.ucl \
 		-p ${WSTAGEDIR}/${pkgname}.plist \
diff --git a/release/packages/kernel.ucl b/release/packages/kernel.ucl
index c89cea6d3f59..67d7bf53db5d 100644
--- a/release/packages/kernel.ucl
+++ b/release/packages/kernel.ucl
@@ -16,6 +16,39 @@ desc = <<EOD
 %DESC%
 EOD
 scripts: {
+	pre-install = <<EOD
+	case ${ASSUME_ALWAYS_YES} in
+		[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee])
+			exit 0
+			;;
+		*)
+			continue
+			;;
+	esac
+	echo "****************************************************************"
+	echo "It is recommended to install the FreeBSD-%PKGNAME% package"
+	echo "with:"
+	echo
+	echo "	pkg install FreeBSD-%PKGNAME%"
+	echo
+	echo "and rebooting the system into the new kernel before upgrading"
+	echo "with:"
+	echo
+	echo "	pkg upgrade"
+	echo
+	echo "****************************************************************"
+	echo
+	echo "Do you want to continue anyway?"
+	echo "[Enter] to continue, ^C to cancel."
+	echo
+	read ANSWER
+	case ${ANSWER} in
+		*)
+			continue
+			;;
+	esac
+EOD
+
 	post-install = <<EOD
 	/usr/sbin/kldxref ${PKG_ROOTDIR}/boot/kernel
 EOD
diff --git a/release/packages/runtime.ucl b/release/packages/runtime.ucl
index f55f1c8fef5c..4d7d0fc14f60 100644
--- a/release/packages/runtime.ucl
+++ b/release/packages/runtime.ucl
@@ -27,6 +27,10 @@ deps: {
     "FreeBSD-clibs": {
         origin: "base"
         version: "%VERSION%"
+    },
+    "FreeBSD-kernel-%KERNCONF%": {
+        origin: "base"
+        version: "%VERSION%"
     }
 }
 directories {