diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index e721cfa9059b..5409cc0c5a18 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -5,7 +5,7 @@ SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
 LINKS=	${BINDIR}/ed ${BINDIR}/red
 MLINKS=	ed.1 red.1
 
-.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT)
+.if exists(${.CURDIR}/../../crypto) && !defined(NO_OPENSSL)
 DISTRIBUTION=crypto
 CFLAGS+=-DDES
 DPADD=	${LIBCRYPTO}
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
index 791c8c57e1c6..77674ab5a606 100644
--- a/secure/usr.bin/Makefile
+++ b/secure/usr.bin/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-SUBDIR= bdes
+SUBDIR=
 .if !defined(NO_OPENSSL)
-SUBDIR+=openssl
+SUBDIR+=bdes openssl
 .if !defined(NO_OPENSSH)
 SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan
 .endif