--- usr.sbin/bhyve/Makefile.orig
+++ usr.sbin/bhyve/Makefile
@@ -3,7 +3,7 @@
 #
 
 .include <src.opts.mk>
-CFLAGS+=-I${.CURDIR}/../../contrib/lib9p
+CFLAGS+=-I${SRCTOP}/contrib/lib9p
 CFLAGS+=-I${SRCTOP}/sys
 .PATH:  ${SRCTOP}/sys/cam/ctl
 
@@ -88,7 +88,8 @@
 .PATH:  ${BHYVE_SYSDIR}/sys/amd64/vmm
 SRCS+=	vmm_instruction_emul.c
 
-LIBADD=	vmmapi md nv pthread z util sbuf cam 9p
+LIBADD=	md nv pthread z util sbuf cam 9p
+LDADD= ${SRCTOP}/contrib/lib9p/lib9p.so.%%9P_SHLIB_MAJOR%% ${SRCTOP}/lib/libvmmapi/libvmmapi.so.%%VMMAPI_SHLIB_MAJOR%%
 
 .if ${MK_BHYVE_SNAPSHOT} != "no"
 LIBADD+= ucl xo