diff --git a/lib/lib9p/Makefile b/lib/lib9p/Makefile
--- a/lib/lib9p/Makefile
+++ b/lib/lib9p/Makefile
@@ -6,8 +6,11 @@
 CFLAGS+=	-I${.CURDIR}
 CFLAGS+=	-I${.CURDIR}/../../contrib/lib9p
 
+LIBADD=		sbuf
+
 .if ${MK_CASPER} != "no"
 CFLAGS+=	-DWITH_CASPER
+LIBADD+=	casper cap_pwd cap_grp
 .endif
 
 LIB=		9p
@@ -28,6 +31,4 @@
 INCSDIR=	${INCLUDEDIR}/lib9p
 INCS=		fid.h lib9p.h backend/fs.h
 
-LIBADD=		sbuf
-
 .include <bsd.lib.mk>
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -271,6 +271,10 @@
 # 2nd+ order consumers.  Auto-generating this would be better.
 _DP_80211=	sbuf bsdxml
 _DP_9p=		sbuf
+.if ${MK_CASPER} != "no"
+_DP_9p+=	casper cap_pwd cap_grp
+.endif
+
 # XXX: Not bootstrapped so uses host version on non-FreeBSD, so don't use a
 # FreeBSD-specific dependency list
 .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING)
diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -89,14 +89,6 @@
 
 LIBADD=	vmmapi md nv pthread z util sbuf cam 9p
 
-.if ${MK_CASPER} != "no"
-LIBADD+=	casper
-LIBADD+=	cap_pwd
-LIBADD+=	cap_grp
-# Temporary disable capsicum, until we integrate checkpoint code with it.
-#CFLAGS+=-DWITH_CASPER
-.endif
-
 .if ${MK_BHYVE_SNAPSHOT} != "no"
 LIBADD+= ucl xo
 .endif