diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile
index ad78f8ae1834..d55b339eb383 100644
--- a/secure/lib/libssl/Makefile
+++ b/secure/lib/libssl/Makefile
@@ -8,21 +8,29 @@ NO_LINT=
 
 .include "../libcrypto/Makefile.inc"
 
-SRCS=	bio_ssl.c d1_both.c d1_clnt.c d1_lib.c d1_meth.c d1_pkt.c d1_srtp.c \
-	d1_srvr.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c \
-	s3_both.c s3_cbc.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c s3_pkt.c \
-	s3_srvr.c ssl_algs.c ssl_asn1.c ssl_cert.c ssl_ciph.c ssl_conf.c \
-	ssl_err.c ssl_err2.c ssl_lib.c ssl_rsa.c ssl_sess.c ssl_stat.c \
-	ssl_txt.c t1_clnt.c t1_enc.c t1_ext.c t1_lib.c t1_meth.c t1_reneg.c \
-	t1_srvr.c tls_srp.c
+SRCS=	bio_ssl.c d1_lib.c d1_msg.c d1_srtp.c methods.c packet.c pqueue.c
+SRCS+=	s3_cbc.c s3_enc.c s3_lib.c s3_msg.c ssl_asn1.c ssl_cert.c ssl_ciph.c
+SRCS+=	ssl_conf.c ssl_err.c ssl_init.c ssl_lib.c ssl_mcnf.c ssl_rsa.c
+SRCS+=	ssl_sess.c ssl_stat.c ssl_txt.c t1_enc.c t1_lib.c tls_srp.c
+SRCS+=	tls13_enc.c
 
-INCS=	dtls1.h kssl.h srtp.h ssl.h ssl2.h ssl23.h ssl3.h tls1.h
-INCSDIR=${INCLUDEDIR}/openssl
+# record
+SRCS+=	dtls1_bitmap.c rec_layer_d1.c rec_layer_s3.c ssl3_buffer.c
+SRCS+=	ssl3_record.c ssl3_record_tls13.c
+
+# statem
+SRCS+=	extensions.c extensions_clnt.c extensions_cust.c extensions_srvr.c
+SRCS+=	statem.c statem_clnt.c statem_dtls.c statem_lib.c statem_srvr.c
 
 LIBADD=	crypto
 
-CFLAGS+=	-I${LCRYPTO_SRC}/crypto
+CFLAGS+=	-I${LCRYPTO_SRC}/ssl
+CFLAGS+=	-I${.OBJDIR:H}/libcrypto
 
 .include <bsd.lib.mk>
 
-.PATH:	${LCRYPTO_SRC}/ssl
+PICFLAG+=	-DOPENSS_PIC
+
+.PATH:	${LCRYPTO_SRC}/ssl \
+	${LCRYPTO_SRC}/ssl/record \
+	${LCRYPTO_SRC}/ssl/statem