Index: user/marcel/libvdsk/bhyve/Makefile
===================================================================
--- user/marcel/libvdsk/bhyve/Makefile	(revision 274781)
+++ user/marcel/libvdsk/bhyve/Makefile	(revision 274782)
@@ -1,51 +1,51 @@
 #
 # $FreeBSD$
 #
 
 PROG=	bhyve
 
 DEBUG_FLAGS= -g -O0 
 
 MAN=	bhyve.8
 
 SRCS=	\
 	atkbdc.c		\
 	acpi.c			\
 	bhyverun.c		\
 	block_if.c		\
 	consport.c		\
 	dbgport.c		\
 	inout.c			\
 	ioapic.c		\
 	mem.c			\
 	mevent.c		\
 	mptbl.c			\
 	pci_ahci.c		\
 	pci_emul.c		\
 	pci_hostbridge.c	\
 	pci_irq.c		\
 	pci_lpc.c		\
 	pci_passthru.c		\
 	pci_virtio_block.c	\
 	pci_virtio_net.c	\
 	pci_virtio_rnd.c	\
 	pci_uart.c		\
 	pm.c			\
 	post.c			\
 	rtc.c			\
 	smbiostbl.c		\
 	task_switch.c		\
 	uart_emul.c		\
 	virtio.c		\
 	xmsr.c			\
 	spinup_ap.c
 
-.PATH:	${.CURDIR}/../../sys/amd64/vmm
+.PATH:	/sys/amd64/vmm
 SRCS+=	vmm_instruction_emul.c
 
 DPADD=	${LIBVMMAPI} ${LIBMD} ${LIBUTIL} ${LIBPTHREAD}
 LDADD=	-lvmmapi -lmd -lutil -lpthread
 
 WARNS?=	2
 
 .include <bsd.prog.mk>
Index: user/marcel/libvdsk/bhyveload/Makefile
===================================================================
--- user/marcel/libvdsk/bhyveload/Makefile	(revision 274781)
+++ user/marcel/libvdsk/bhyveload/Makefile	(revision 274782)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
 PROG=	bhyveload
 SRCS=	bhyveload.c
 MAN=	bhyveload.8
 
 DPADD+=	${LIBVMMAPI} ${LIBUTIL}
 LDADD+=	-lvmmapi -lutil
 
 WARNS?=	3
 
-CFLAGS+=-I${.CURDIR}/../../sys/boot/userboot
+CFLAGS+=-I/sys/boot/userboot
 
 .include <bsd.prog.mk>