diff --git a/Makefile.inc1 b/Makefile.inc1
index bcb948734ad..8a8f8cd3102 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1207,6 +1207,7 @@ bootstrap-tools:
     ${_sed} \
     ${_yacc} \
     ${_lex} \
+    lib/libmd \
     usr.bin/xinstall \
     ${_gensnmptree} \
     usr.sbin/config \
diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index d9d587302c0..773dd4ef877 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -7,10 +7,12 @@ SRCS=		xinstall.c getid.c
 MAN=		install.1
 
 .PATH:		${.CURDIR}/../../contrib/mtree
+.PATH:		${.CURDIR}/../../lib/libmd
 CFLAGS+=	-I${.CURDIR}/../../contrib/mtree
 CFLAGS+=	-I${.CURDIR}/../../lib/libnetbsd
+CFLAGS+=	-I${.CURDIR}/../../lib/libmd
 
-DPADD+=		${LIBUTIL} ${LIBMD}
-LDADD+=		-lutil -lmd
+DPADD+=		${LIBMD}
+LDADD+=		-lmd
 
 .include <bsd.prog.mk>