diff --git a/Makefile.inc1 b/Makefile.inc1
index 1d3c02f83c60..9f73a20323b8 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -897,12 +897,11 @@ _generic_libs+=	kerberos5/lib
 _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \
 		lib/libkvm lib/libmd \
 		lib/libncurses lib/libnetgraph lib/libopie lib/libpam \
-		lib/libradius lib/librpcsvc \
+		lib/libradius \
 		lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \
 		lib/libz lib/msun
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L
-lib/libypclnt__L: lib/librpcsvc__L
 
 _generic_libs+=	lib
 
@@ -912,7 +911,12 @@ _prebuild_libs+=	secure/lib/libcrypto secure/lib/libssl
 lib/libradius__L: secure/lib/libssl__L
 .if !defined(NO_OPENSSH)
 _prebuild_libs+=	secure/lib/libssh
-secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L
+secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
+.if !defined(NO_KERBEROS)
+secure/lib/libssh__L: kerberos5/lib/libgssapi__L kerberos5/lib/libkrb5__L \
+    kerberos5/lib/libasn1__L lib/libcom_err__L lib/libmd__L \
+    kerberos5/lib/libroken__L
+.endif
 .endif
 .endif
 _generic_libs+=	secure/lib