Index: head/etc/rc.d/kldxref
===================================================================
--- head/etc/rc.d/kldxref	(revision 333490)
+++ head/etc/rc.d/kldxref	(revision 333491)
@@ -1,36 +1,37 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: kldxref
 # REQUIRE: FILESYSTEMS
 # BEFORE:  netif
 # KEYWORD: nojail
 
 . /etc/rc.subr
 
 rcvar="kldxref_enable"
 name="kldxref"
 desc="Generate hints for the kernel loader"
 stop_cmd=":"
 start_cmd="kldxref_start"
 
 kldxref_start() {
 	if [ -n "$kldxref_module_path" ]; then
 		MODULE_PATHS="$kldxref_module_path"
 	else
 		MODULE_PATHS=`sysctl -n kern.module_path`
 	fi
 	IFS=';'
 	for MODULE_DIR in $MODULE_PATHS; do
-		if [ ! -f "$MODULE_DIR/linker.hints" ] ||
-		    checkyesno kldxref_clobber; then
+		if checkyesno kldxref_clobber ||
+		    [ ! -f "$MODULE_DIR/linker.hints" ] &&
+		    [ `echo ${MODULE_DIR}/*.ko` != "${MODULE_DIR}/*.ko" ]; then
 			echo "Building $MODULE_DIR/linker.hints"
 			kldxref "$MODULE_DIR"
 		fi
 	done
 }
 
 load_rc_config $name
 run_rc_command "$1"