diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile
index e64ff3e1a4b2..83182e904b3e 100644
--- a/libexec/rpc.rwalld/Makefile
+++ b/libexec/rpc.rwalld/Makefile
@@ -4,7 +4,7 @@ PROG =	rpc.rwalld
 SRCS =	rwalld.c
 MAN =	rpc.rwalld.8
 
-DPADD=	${LIBRPCSVC} ${LIBUTIL}
-LDADD=	-lrpcsvc -lutil
+DPADD=	${LIBUTIL}
+LDADD=	-lutil
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/keylogout/Makefile b/usr.bin/keylogout/Makefile
index cc433e444669..1f5feec6e9d0 100644
--- a/usr.bin/keylogout/Makefile
+++ b/usr.bin/keylogout/Makefile
@@ -2,7 +2,4 @@
 
 PROG=	keylogout
 
-DPADD=	${LIBRPCSVC}
-LDADD=	-lrpcsvc
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile
index f402c0362329..4e448dbd2ca7 100644
--- a/usr.bin/rwall/Makefile
+++ b/usr.bin/rwall/Makefile
@@ -2,7 +2,4 @@
 
 PROG = rwall
 
-DPADD=	${LIBRPCSVC}
-LDADD=	-lrpcsvc
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index a05a72866d18..eb30395a46d2 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -25,8 +25,8 @@ SRCS+=	srvr_amfs_auto.c srvr_nfs.c
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd \
 	 -I${DESTDIR}/usr/include/rpcsvc
 
-DPADD=	${LIBAMU} ${LIBRPCSVC}
-LDADD=	${LIBAMU} -lrpcsvc
+DPADD=	${LIBAMU}
+LDADD=	${LIBAMU}
 
 CLEANFILES+=	conf_parse.c conf_parse.h conf_tok.c
 
diff --git a/usr.sbin/amd/hlfsd/Makefile b/usr.sbin/amd/hlfsd/Makefile
index b2c94476f034..5b863dd5adcd 100644
--- a/usr.sbin/amd/hlfsd/Makefile
+++ b/usr.sbin/amd/hlfsd/Makefile
@@ -13,7 +13,7 @@ SRCS=	hlfsd.c homedir.c nfs_prot_svc.c stubs.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/hlfsd
 
-DPADD=	${LIBAMU} ${LIBRPCSVC}
-LDADD=	${LIBAMU} -lrpcsvc
+DPADD=	${LIBAMU}
+LDADD=	${LIBAMU}
 
 .include <bsd.prog.mk>