Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -1813,6 +1813,7 @@
 		-e "s/%COMMENT%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
 		-e "s/%DESC%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
 		-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
+		-e "s/%KDIRNAME%/kernel/" \
 		${SRCDIR}/release/packages/kernel.ucl \
 		> ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
 	awk -F\" ' \
@@ -1845,6 +1846,7 @@
 		-e "s/%COMMENT%/FreeBSD ${_kernel} kernel ${flavor}/" \
 		-e "s/%DESC%/FreeBSD ${_kernel} kernel ${flavor}/" \
 		-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
+		-e "s/%KDIRNAME%/kernel.${_kernel}/" \
 		${SRCDIR}/release/packages/kernel.ucl \
 		> ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \
 	awk -F\" ' \
Index: release/packages/kernel.ucl
===================================================================
--- release/packages/kernel.ucl
+++ release/packages/kernel.ucl
@@ -19,4 +19,12 @@
 	post-install = <<EOD
 	/usr/sbin/kldxref ${PKG_ROOTDIR}/boot/%KERNELDIR%
 EOD
+	deinstall = <<EOD
+	KDN="%KDIRNAME%"
+	if [ -d ${PKG_ROOTDIR}/boot/${KDN}.old ] ; then
+		chflags -R noschg ${PKG_ROOTDIR}/boot/${KDN}.old
+		rm -rf ${PKG_ROOTDIR}/boot/${KDN}.old
+	fi
+	cp -a ${PKG_ROOTDIR}/boot/${KDN} ${PKG_ROOTDIR}/boot/${KDN}.old
+EOD
 }