diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index c7301d4737e6..fce50b223b77 100644
--- a/usr.bin/cpio/Makefile
+++ b/usr.bin/cpio/Makefile
@@ -9,7 +9,10 @@ WARNS?=	6
 DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2}
 CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
 CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
-LDADD+=	-larchive -lz -lbz2 -lmd -lcrypto
+LDADD+=	-larchive -lz -lbz2 -lmd
+.if ${MK_OPENSSL} != "no"
+LDADD+= -lcrypto
+.endif
 
 .if ${MK_GNU_CPIO} != "yes"
 SYMLINKS=bsdcpio ${BINDIR}/cpio
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index 28007f7e56c2..10998462d91a 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -1,11 +1,15 @@
 # $FreeBSD$
+.include <bsd.own.mk>
 
 PROG=	bsdtar
 BSDTAR_VERSION_STRING=2.7.0
 SRCS=	bsdtar.c cmdline.c getdate.c matching.c read.c siginfo.c subst.c tree.c util.c write.c
 WARNS?=	5
 DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
-LDADD=	-larchive -lbz2 -lz -lmd -lcrypto
+LDADD=	-larchive -lbz2 -lz -lmd
+.if ${MK_OPENSSL} != "no"
+LDADD+= -lcrypto
+.endif
 CFLAGS+=	-DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\"
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"config_freebsd.h\"
 CFLAGS+=	-I${.CURDIR}