diff --git a/lib/Makefile b/lib/Makefile
index 79882ed470c..4982ef2b8de 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -23,7 +23,7 @@ SUBDIR=	${_csu} libcom_err libcrypt msun libmd \
 	${_compat} libalias libatm ${_libbind} libbz2 libc ${_libc_r} \
 	libcalendar libcam libcompat libdevinfo libdevstat libdisk \
 	libedit libfetch libform libftpio libgnumalloc ${_libio} libipsec \
-	libipx libisc libkvm libmenu libmp ${_libncp} \
+	libipx libisc libkvm libmenu ${_libmp} ${_libncp} \
 	libnetgraph libopie libpam libpanel libpcap \
 	libresolv librpcsvc libsmdb libsmutil libss \
 	libstand ${_libtelnet} libusb ${_libvgl} libwrap libxpg4 liby libz
@@ -61,4 +61,8 @@ _compat=	compat
 _libtelnet=	libtelnet
 .endif
 
+.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+_libmp=		libmp
+.endif
+
 .include <bsd.subdir.mk>
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index a32ac6f1990..bc053b545e1 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -20,7 +20,6 @@ SUBDIR=	apply \
 	chat \
 	checknr \
 	chflags \
-	chkey \
 	chpass \
 	cksum \
 	cmp \
@@ -105,7 +104,6 @@ SUBDIR=	apply \
 	mt \
 	ncal \
 	netstat \
-	newkey \
 	nfsstat \
 	nice \
 	nl \
@@ -230,4 +228,8 @@ SUBDIR+=ar \
 SUBDIR+=uac
 .endif
 
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+SUBDIR+=chkey newkey
+.endif
+
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index eff6ad462a0..f4eea333ca1 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -46,7 +46,6 @@ SUBDIR=	IPXrouted \
 	kbdcontrol \
 	kbdmap \
 	kernbb \
-	keyserv \
 	lastlogin \
 	manctl \
 	memcontrol \
@@ -185,4 +184,8 @@ SUBDIR+=boot0cfg
 SUBDIR+=boot98cfg
 .endif
 
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+SUBDIR+=keyserv
+.endif
+
 .include <bsd.subdir.mk>