diff --git a/Makefile.inc1 b/Makefile.inc1
index b5abb87a60b3..2ecd6bd3fa7c 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -717,11 +717,11 @@ _generic_libs+=	lib
 .if !defined(NOCRYPT) && !defined(NOSECURE)
 .if !defined(NO_OPENSSL)
 _prebuild_libs+=	secure/lib/libcrypto secure/lib/libssl
-.endif
-.if !defined(NO_OPENSSH) && !defined(NO_OPENSSL)
+.if !defined(NO_OPENSSH)
 _prebuild_libs+=	secure/lib/libssh
 secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L
 .endif
+.endif
 _generic_libs+=	secure/lib
 .endif
 
diff --git a/etc/Makefile b/etc/Makefile
index 5652c5b6c890..65d7ec469e1d 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -27,13 +27,12 @@ BIN1=   amd.map apmd.conf auth.conf \
 BIN1+=	rc.isdn
 .endif
 
-.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSH)
+.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
+.if !defined(NO_OPENSSH)
 SSH=	${.CURDIR}/../crypto/openssh/ssh_config \
 	${.CURDIR}/../crypto/openssh/sshd_config \
 	moduli
 .endif
-
-.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
 SSL=	${.CURDIR}/../crypto/openssl/apps/openssl.cnf
 .endif
 
@@ -92,11 +91,11 @@ distribution:
 .if !defined(NO_SENDMAIL)
 	( cd ${.CURDIR}/sendmail; ${MAKE} distribution );
 .endif
-.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSH)
+.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
+.if !defined(NO_OPENSSH)
 	(cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${SSH} \
 	    ${DESTDIR}/etc/ssh )
 .endif
-.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
 	(cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${SSL} \
 	    ${DESTDIR}/etc/ssl )
 .endif
diff --git a/secure/lib/Makefile b/secure/lib/Makefile
index a6f15de72504..40731dd3f3ff 100644
--- a/secure/lib/Makefile
+++ b/secure/lib/Makefile
@@ -6,9 +6,9 @@ SUBDIR+=libtelnet
 .endif
 .if !defined(NO_OPENSSL)
 SUBDIR+=libcrypto libssl
-.endif
 .if !defined(NO_OPENSSH)
 SUBDIR+=libssh
 .endif
+.endif
 
 .include <bsd.subdir.mk>