diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
index 54ddb5bc9623..f6065c9ea333 100644
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -19,7 +19,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 
-DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
-LDADD=	-lgeom -lm -lnvpair -luutil -lzfs
+DPADD=	${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD=	-lzfs -lgeom -lbsdxml -lsbuf \
+	-lm -lnvpair -luutil -lutil
 
 .include <bsd.prog.mk>
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index 24ce7b68482d..f2739c2baecd 100644
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -19,7 +19,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 
-DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
-LDADD=	-lavl -lgeom -lm -lnvpair -luutil -lzfs
+DPADD=	${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD=	-lavl -lzfs -lgeom -lbsdxml -lsbuf \
+	-lm -lnvpair -luutil -lutil
 
 .include <bsd.prog.mk>
diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
index e109febad90f..49502ab46cc8 100644
--- a/cddl/usr.bin/ztest/Makefile
+++ b/cddl/usr.bin/ztest/Makefile
@@ -15,7 +15,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
 CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
-LDADD=	-lavl -lm -lnvpair -lpthread -lumem -lzpool
+DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
 
 .include <bsd.prog.mk>
diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
index 4b1f87549fbe..72b9b306a8b1 100644
--- a/cddl/usr.sbin/zdb/Makefile
+++ b/cddl/usr.sbin/zdb/Makefile
@@ -16,7 +16,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
-LDADD=	-lavl -lm -lnvpair -lpthread -lumem -lzpool
+DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
 
 .include <bsd.prog.mk>
diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile
index c922dc530329..4e3d4ccace58 100644
--- a/libexec/atrun/Makefile
+++ b/libexec/atrun/Makefile
@@ -16,7 +16,7 @@ CFLAGS+=-DLOGIN_CAP -DPAM
 WFORMAT=0
 
 DPADD=	${LIBPAM} ${LIBUTIL}
-LDADD=	-lpam -lutil
+LDADD=	${MINUSLPAM} -lutil
 
 atrun.8: atrun.man
 	@${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \
diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile
index 92d3ee4ab18d..77ca47a1dc09 100644
--- a/usr.sbin/cron/cron/Makefile
+++ b/usr.sbin/cron/cron/Makefile
@@ -7,6 +7,6 @@ SRCS=	cron.c database.c do_command.c job.c user.c popen.c
 CFLAGS+= -DLOGIN_CAP -DPAM
 
 DPADD=	${LIBCRON} ${LIBPAM} ${LIBUTIL}
-LDADD=	${LIBCRON} -lpam -lutil
+LDADD=	${LIBCRON} ${MINUSLPAM} -lutil
 
 .include <bsd.prog.mk>