Index: games/factor/Makefile
===================================================================
--- games/factor/Makefile	(revision 287538)
+++ games/factor/Makefile	(working copy)
@@ -9,8 +9,7 @@
 
 .if ${MK_OPENSSL} != "no"
 CFLAGS+=-DHAVE_OPENSSL
-DPADD=	${LIBCRYPTO}
-LDADD=	-lcrypto
+LIBADD= crypto
 .endif
 
 MAN=	factor.6
Index: kerberos5/usr.bin/krb5-config/Makefile
===================================================================
--- kerberos5/usr.bin/krb5-config/Makefile	(revision 287538)
+++ kerberos5/usr.bin/krb5-config/Makefile	(working copy)
@@ -14,7 +14,7 @@
 	    -e "s,@includedir\@,${INCLUDEDIR},g" \
 	    -e "s,@LIB_crypt\@,-lcrypt,g" \
 	    -e "s,@LIB_dbopen\@,,g" \
-	    -e "s,@LIB_hcrypto_appl\@,-lcrypto,g" \
+	    -e "s,@LIB_hcrypto_appl\@,-lprivatecrypto,g" \
 	    -e "s,@LIB_pkinit\@,-lhx509,g" \
 	    -e "s,@LIB_dlopen\@,,g" \
 	    -e "s,@LIB_door_create\@,,g" \
Index: lib/libc/tests/hash/Makefile
===================================================================
--- lib/libc/tests/hash/Makefile	(revision 287538)
+++ lib/libc/tests/hash/Makefile	(working copy)
@@ -24,10 +24,8 @@
 FILES+=		data/sha1test-out
 FILES+=		data/sha1test2-out
 
-DPADD+=		${LIBMD}
-LDADD+=		-lmd
-DPADD.sha2_test+=	${LIBCRYPTO}
-LDADD.sha2_test+=	-lcrypto
+LIBADD+=	md
+LIBADD.sha2_test+=	crypto
 
 CFLAGS.sha2_test+=	-I${.CURDIR}/../../../../crypto/openssh/openbsd-compat
 CFLAGS.sha2_test+=	-I${.CURDIR}/../../../../crypto/openssh
Index: rescue/rescue/Makefile
===================================================================
--- rescue/rescue/Makefile	(revision 287538)
+++ rescue/rescue/Makefile	(working copy)
@@ -197,7 +197,7 @@
 CRUNCH_PROGS_usr.bin+= tar
 CRUNCH_LIBS+= -larchive
 .if ${MK_OPENSSL} != "no"
-CRUNCH_LIBS+= -lcrypto
+CRUNCH_LIBS+= -lprivatecrypto
 .endif
 CRUNCH_LIBS+= -lmd
 
Index: secure/lib/libcrypto/Makefile
===================================================================
--- secure/lib/libcrypto/Makefile	(revision 287538)
+++ secure/lib/libcrypto/Makefile	(working copy)
@@ -9,6 +9,8 @@
 SHLIB_MAJOR=	7
 ALLOW_SHARED_TEXTREL=
 
+PRIVATELIB=	true
+
 NO_LINT=
 
 .if exists(Makefile.man)
Index: secure/lib/libssl/Makefile
===================================================================
--- secure/lib/libssl/Makefile	(revision 287538)
+++ secure/lib/libssl/Makefile	(working copy)
@@ -3,6 +3,8 @@
 LIB=		ssl
 SHLIB_MAJOR=	7
 
+PRIVATELIB=	true
+
 NO_LINT=
 
 .if exists(Makefile.man)
Index: share/mk/src.libnames.mk
===================================================================
--- share/mk/src.libnames.mk	(revision 287538)
+++ share/mk/src.libnames.mk	(working copy)
@@ -19,6 +19,7 @@
 		atf_c \
 		atf_cxx \
 		bsdstat \
+		crypto \
 		event \
 		heimipcc \
 		heimipcs \
@@ -25,6 +26,7 @@
 		ldns \
 		sqlite3 \
 		ssh \
+		ssl \
 		ucl \
 		unbound
 
@@ -72,7 +74,6 @@
 		com_err \
 		compiler_rt \
 		crypt \
-		crypto \
 		ctf \
 		cuse \
 		cxxrt \
@@ -143,7 +144,6 @@
 		sdp \
 		sm \
 		smb \
-		ssl \
 		ssp_nonshared \
 		stdthreads \
 		supcplusplus \
@@ -365,4 +365,3 @@
 
 LIBAMUDIR=	${ROOTOBJDIR}/usr.sbin/amd/libamu
 LIBAMU?=	${LIBAMUDIR}/libamu/libamu.a
-