Index: head/usr.sbin/freebsd-update/freebsd-update.sh
===================================================================
--- head/usr.sbin/freebsd-update/freebsd-update.sh
+++ head/usr.sbin/freebsd-update/freebsd-update.sh
@@ -2943,6 +2943,17 @@
 			cap_mkdb ${BASEDIR}/etc/login.conf
 		fi
 
+		# Rebuild man page databases, if necessary.
+		for D in /usr/share/man /usr/share/openssl/man; do
+			if [ ! -d ${BASEDIR}/$D ]; then
+				continue
+			fi
+			if [ -z "$(find ${BASEDIR}/$D -type f -newer ${BASEDIR}/$D/mandoc.db)" ]; then
+				continue;
+			fi
+			makewhatis ${BASEDIR}/$D
+		done
+
 		# We've finished installing the world and deleting old files
 		# which are not shared libraries.
 		touch $1/worlddone