diff --git a/sys/boot/userboot/ficl/Makefile b/sys/boot/userboot/ficl/Makefile
index 927a504d8ce0..d09f1c06c923 100644
--- a/sys/boot/userboot/ficl/Makefile
+++ b/sys/boot/userboot/ficl/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 #
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 MK_SSP=		no
 
-.PATH: ${.CURDIR}/../../ficl
-.PATH: ${.CURDIR}/../../ficl/${MACHINE_CPUARCH}
+.include "${BOOTSRC}/ficl.mk"
+
 BASE_SRCS=	dict.c ficl.c fileaccess.c float.c loader.c math64.c \
 		prefix.c search.c stack.c tools.c vm.c words.c
 
@@ -29,7 +29,7 @@ INTERNALLIB=
 .endif
 
 # Standard softwords
-.PATH: ${.CURDIR}/../../ficl/softwords
+.PATH: ${BOOTSRC}/ficl/softwords
 SOFTWORDS=	softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \
 		ifbrack.fr
 # Optional OO extension softwords
@@ -43,12 +43,8 @@ SOFTWORDS=	softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \
 CFLAGS+=	-m32 -mcpu=powerpc -I.
 .endif
 
-CFLAGS+=	-I${.CURDIR}/../../ficl
-CFLAGS+=	-I${.CURDIR}/../../ficl/${MACHINE_CPUARCH}
-CFLAGS+=	-I${.CURDIR}/../../common
-
 softcore.c: ${SOFTWORDS} softcore.awk
-	(cd ${.CURDIR}/../../ficl/softwords; cat ${SOFTWORDS} \
+	(cd ${FICLSRC}/softwords; cat ${SOFTWORDS} \
 	    | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET}
 
 #.if ${MACHINE_CPUARCH} == "amd64"
diff --git a/sys/boot/userboot/test/Makefile b/sys/boot/userboot/test/Makefile
index e9ecf58c77a7..cfca6971d12c 100644
--- a/sys/boot/userboot/test/Makefile
+++ b/sys/boot/userboot/test/Makefile
@@ -3,13 +3,13 @@
 
 MAN=
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 MK_SSP=		no
 
 PROG=		test
 INTERNALPROG=
 
-CFLAGS+=	-I${.CURDIR}/..
-CFLAGS+=	-I${.CURDIR}/../../..
+CFLAGS+=	-I${BOOTSRC}/userboot
+CFLAGS+=	-I${SYSDIR}
 
 .include <bsd.prog.mk>
diff --git a/sys/boot/userboot/userboot/Makefile b/sys/boot/userboot/userboot/Makefile
index d8fb60881782..68ee77c15615 100644
--- a/sys/boot/userboot/userboot/Makefile
+++ b/sys/boot/userboot/userboot/Makefile
@@ -2,7 +2,8 @@
 
 MAN=
 
-.include <src.opts.mk>
+.include <bsd.init.mk>
+
 MK_SSP=		no
 
 LOADER_MSDOS_SUPPORT?=	yes
@@ -34,8 +35,8 @@ SRCS+=		userboot_disk.c
 SRCS+=		vers.c
 
 CFLAGS+=	-Wall
-CFLAGS+=	-I${.CURDIR}/..
-CFLAGS+=	-I${.CURDIR}/../../..
+CFLAGS+=	-I${BOOTSRC}/userboot
+CFLAGS+=	-I${SYSDIR}
 CFLAGS+=	-ffreestanding -I.
 
 CWARNFLAGS.main.c += -Wno-implicit-function-declaration
@@ -46,11 +47,11 @@ NEWVERSWHAT=	"User boot" ${MACHINE_CPUARCH}
 
 .if ${MK_ZFS} != "no"
 CFLAGS+=	-DUSERBOOT_ZFS_SUPPORT
-LIBZFSBOOT=	${.OBJDIR}/../zfs/libzfsboot.a
+LIBZFSBOOT=	${BOOTOBJ}/userboot/zfs/libzfsboot.a
 .endif
 
 # Always add MI sources 
-.include	"../../loader.mk"
+.include	"${BOOTSRC}/loader.mk"
 CFLAGS+=	-I.
 DPADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSA} 
 LDADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSA}
diff --git a/sys/boot/userboot/zfs/Makefile b/sys/boot/userboot/zfs/Makefile
index c34d15993494..e39db54d1dc5 100644
--- a/sys/boot/userboot/zfs/Makefile
+++ b/sys/boot/userboot/zfs/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-S=		${.CURDIR}/../../zfs
+.include <bsd.init.mk>
 
-.PATH:		${S} ${.CURDIR}/../../../crypto/skein
+.PATH:		${BOOTSRC}/zfs ${SYSDIR}/crypto/skein
 LIB=		zfsboot
 INTERNALLIB=
 
@@ -11,10 +11,10 @@ SRCS+=		zfs.c skein.c skein_block.c
 # Do not unroll skein loops, reduce code size
 CFLAGS+=	-DSKEIN_LOOP=111
 
-CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
+CFLAGS+=	-I${LDRSRC} -I${SYSDIR} -I.
 CFLAGS+=	-I${SASRC}
-CFLAGS+=	-I${.CURDIR}/../../../cddl/boot/zfs
-CFLAGS+=	-I${.CURDIR}/../../../crypto/skein
+CFLAGS+=	-I${SYSDIR}/cddl/boot/zfs
+CFLAGS+=	-I${SYSDIR}/crypto/skein
 
 CFLAGS+=	-ffreestanding -fPIC
 CFLAGS+=	-Wformat -Wall