Index: Keywords/kld.ucl
===================================================================
--- /dev/null
+++ Keywords/kld.ucl
@@ -0,0 +1,23 @@
+# $FreeBSD$
+#
+# MAINTAINER: rene@FreeBSD.org
+
+actions: []
+post-install: <<EOD
+  case "%@" in
+  /*) kmoddir="%@" ;;
+  *) kmoddir="%D/%@" ;;
+  esac
+  /usr/sbin/kldxref ${kmoddir}
+EOD
+post-deinstall: <<EOD
+  case "%@" in
+  /*) kmoddir="%@" ;;
+  *) kmoddir="%D/%@" ;;
+  esac
+  /usr/sbin/kldxref ${kmoddir}
+  case "${kmoddir}" in
+  %D/*) ;;
+  *) rmdir -p ${kmoddir} 2>/dev/null || true ;;
+  esac
+EOD
Index: Mk/Uses/kmod.mk
===================================================================
--- Mk/Uses/kmod.mk
+++ Mk/Uses/kmod.mk
@@ -31,6 +31,7 @@
 .endif
 PLIST_SUB+=	KMODDIR="${KMODDIR:C,^/,,}"
 MAKE_ENV+=	KMODDIR="${KMODDIR}" SYSDIR="${SRC_BASE}/sys" NO_XREF=yes
+PLIST_FILES+=	"@kld ${KMODDIR}"
 
 STRIP_CMD+=	--strip-debug # do not strip kernel symbols
 .endif
@@ -42,12 +43,4 @@
 ${STAGEDIR}${KMODDIR}:
 	@${MKDIR} ${.TARGET}
 
-kmod-post-install:
-	@${ECHO_CMD} "@exec /usr/sbin/kldxref ${KMODDIR}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec /usr/sbin/kldxref ${KMODDIR}" >> ${TMPPLIST}
-.if ${KMODDIR} != /boot/modules
-	@${ECHO_CMD} "@unexec rmdir -p ${KMODDIR} 2>/dev/null || true" \
-		>> ${TMPPLIST}
-.endif
-
 .endif