Index: head/sys/conf/sysent.mk
===================================================================
--- head/sys/conf/sysent.mk	(revision 362992)
+++ head/sys/conf/sysent.mk	(revision 362993)
@@ -1,38 +1,45 @@
 # $FreeBSD$
 
 # Don't use an OBJDIR
 .OBJDIR: ${.CURDIR}
 
 .include <bsd.sysdir.mk>
 .include <src.lua.mk>
 
 COMMON_GENERATED=	proto.h		\
 			syscall.h	\
 			syscalls.c	\
 			sysent.c	\
 			systrace_args.c
 
 GENERATED_PREFIX?=
 GENERATED?=	${COMMON_GENERATED:S/^/${GENERATED_PREFIX}/}
 SYSENT_FILE?=	syscalls.master
 SYSENT_CONF?=	syscalls.conf
 
 # Including Makefile should override SYSENT_FILE and SYSENT_CONF as needed,
 # and set GENERATED.
 SRCS+=	${SYSENT_FILE}
 SRCS+=	${SYSENT_CONF}
 
+# Ensure that the target gets updated if the capabilities file is modified,
+# even though it is not an explicit input to makesyscalls.lua.  For some
+# targets, like Linux system calls, this is unnecessary, but a spurious rebuild
+# is both rare and harmless.
+CAPABILITIES_CONF?= ${SYSDIR}/kern/capabilities.conf
+SRCS+=	${CAPABILITIES_CONF}
+
 MAKESYSCALLS_INTERP?=	${LUA}
 MAKESYSCALLS_SCRIPT?=	${SYSDIR}/tools/makesyscalls.lua
 MAKESYSCALLS=	${MAKESYSCALLS_INTERP} ${MAKESYSCALLS_SCRIPT}
 
 all:
 	@echo "make sysent only"
 
 # We .ORDER these explicitly so that we only run MAKESYSCALLS once, rather than
 # potentially once for each ${GENERATED} file.
 .ORDER: ${GENERATED}
 sysent: ${GENERATED}
 
 ${GENERATED}: ${MAKESYSCALLS_SCRIPT} ${SRCS}
 	${MAKESYSCALLS} ${SYSENT_FILE} ${SYSENT_CONF}