Index: release/Makefile
===================================================================
--- release/Makefile
+++ release/Makefile
@@ -215,6 +215,8 @@
 	echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
 	echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
 	cp ${.CURDIR}/rc.local ${.TARGET}/etc
+	[ -x /usr/sbin/certctl ] && \
+	    env DESTDIR=${.TARGET} /usr/sbin/certctl rehash
 	touch ${.TARGET}
 
 bootonly: packagesystem
@@ -243,6 +245,8 @@
 	echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
 	echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
 	cp ${.CURDIR}/rc.local ${.TARGET}/etc
+	[ -x /usr/sbin/certctl ] && \
+	    env DESTDIR=${.TARGET} /usr/sbin/certctl rehash
 
 dvd: packagesystem
 # Install system
@@ -268,6 +272,8 @@
 	echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
 	echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
 	cp ${.CURDIR}/rc.local ${.TARGET}/etc
+	[ -x /usr/sbin/certctl ] && \
+	    env DESTDIR=${.TARGET} /usr/sbin/certctl rehash
 	touch ${.TARGET}
 
 release.iso: disc1.iso
Index: release/tools/arm.subr
===================================================================
--- release/tools/arm.subr
+++ release/tools/arm.subr
@@ -189,6 +189,10 @@
 	arm_setup_minimal_loader
 	arm_do_quirk
 
+	if [ -x /usr/sbin/certctl ]; then
+		env DESTDIR=${CHROOTDIR}/${DESTDIR} /usr/sbin/certctl rehash
+	fi
+
 	echo '# Custom /etc/fstab for FreeBSD embedded images' \
 		> ${CHROOTDIR}/${DESTDIR}/etc/fstab
 	if [ "${PART_SCHEME}" == "GPT" ]; then
Index: release/tools/vmimage.subr
===================================================================
--- release/tools/vmimage.subr
+++ release/tools/vmimage.subr
@@ -135,6 +135,10 @@
 		-F "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \
 		-D ${DESTDIR}
 
+	if [ -x /usr/sbin/certctl ]; then
+		env DESTDIR=${DESTDIR} /usr/sbin/certctl rehash
+	fi
+
 	echo '# Custom /etc/fstab for FreeBSD VM images' \
 		> ${DESTDIR}/etc/fstab
 	echo "/dev/${ROOTLABEL}/rootfs   /       ufs     rw      1       1" \