Index: head/etc/mtree/BSD.lib32.dist
===================================================================
--- head/etc/mtree/BSD.lib32.dist	(revision 361699)
+++ head/etc/mtree/BSD.lib32.dist	(revision 361700)
@@ -1,20 +1,22 @@
 # $FreeBSD$
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
     lib32
         dtrace
         ..
+        engines
+        ..
         geom
         ..
         i18n
         ..
         libxo
             encoder
             ..
         ..
     ..
 ..
Index: head/secure/lib/libcrypto/Makefile.inc
===================================================================
--- head/secure/lib/libcrypto/Makefile.inc	(revision 361699)
+++ head/secure/lib/libcrypto/Makefile.inc	(revision 361700)
@@ -1,83 +1,83 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 # OpenSSL version used for manual page generation
 OPENSSL_VER=	1.1.1g
 OPENSSL_DATE=	2020-04-21
 
 LCRYPTO_SRC=	${SRCTOP}/crypto/openssl
 LCRYPTO_DOC=	${LCRYPTO_SRC}/doc
 
 CFLAGS+=	-I${LCRYPTO_SRC}
 CFLAGS+=	-I${LCRYPTO_SRC}/crypto/include
 CFLAGS+=	-I${LCRYPTO_SRC}/include
 
 .include <bsd.endian.mk>
 
 .if ${TARGET_ENDIANNESS} == 1234
 CFLAGS+=	-DL_ENDIAN
 .elif ${TARGET_ENDIANNESS} == 4321
 CFLAGS+=	-DB_ENDIAN
 .endif
 
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
     ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386"
 ASM_${MACHINE_CPUARCH}=
 .endif
 
 .if defined(ASM_${MACHINE_CPUARCH})
 CFLAGS+=	-DOPENSSL_CPUID_OBJ
 .if defined(ASM_aarch64)
 CFLAGS+=	-DOPENSSL_BN_ASM_MONT
 CFLAGS+=	-DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
 CFLAGS+=	-DKECCAK1600_ASM
 CFLAGS+=	-DVPAES_ASM
 CFLAGS+=	-DECP_NISTZ256_ASM
 CFLAGS+=	-DPOLY1305_ASM
 .elif defined(ASM_amd64)
 CFLAGS+=	-DOPENSSL_IA32_SSE2
 CFLAGS+=	-DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5
 CFLAGS+=	-DOPENSSL_BN_ASM_GF2m
 CFLAGS+=	-DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
 CFLAGS+=	-DKECCAK1600_ASM
 CFLAGS+=	-DRC4_ASM
 CFLAGS+=	-DMD5_ASM
 CFLAGS+=	-DVPAES_ASM
 CFLAGS+=	-DGHASH_ASM
 CFLAGS+=	-DECP_NISTZ256_ASM -DX25519_ASM
 CFLAGS+=	-DPADLOCK_ASM
 CFLAGS+=	-DPOLY1305_ASM
 .elif defined(ASM_arm)
 CFLAGS+=	-DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
 CFLAGS+=	-DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
 CFLAGS+=	-DKECCAK1600_ASM
 CFLAGS+=	-DBSAES_ASM
 CFLAGS+=	-DGHASH_ASM
 CFLAGS+=	-DECP_NISTZ256_ASM
 CFLAGS+=	-DPOLY1305_ASM
 .elif defined(ASM_i386)
 CFLAGS+=	-DOPENSSL_IA32_SSE2
 CFLAGS+=	-DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_BN_ASM_MONT
 CFLAGS+=	-DOPENSSL_BN_ASM_GF2m
 CFLAGS+=	-DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
 CFLAGS+=	-DRC4_ASM
 CFLAGS+=	-DMD5_ASM
 CFLAGS+=	-DRMD160_ASM
 CFLAGS+=	-DVPAES_ASM
 CFLAGS+=	-DWHIRLPOOL_ASM
 CFLAGS+=	-DGHASH_ASM
 CFLAGS+=	-DECP_NISTZ256_ASM
 CFLAGS+=	-DPADLOCK_ASM
 CFLAGS+=	-DPOLY1305_ASM
 .endif
 .endif
 
 .if defined(LIB)
 CFLAGS+=	-DOPENSSLDIR="\"/etc/ssl\""
-CFLAGS+=	-DENGINESDIR="\"/usr/lib/engines\""
+CFLAGS+=	-DENGINESDIR="\"${LIBDIR}/engines\""
 .endif
 
 CFLAGS+=	-DNDEBUG
 
 MANDIR=		${SHAREDIR}/openssl/man/man
Index: head/secure/lib/libcrypto/engines/Makefile.inc
===================================================================
--- head/secure/lib/libcrypto/engines/Makefile.inc	(revision 361699)
+++ head/secure/lib/libcrypto/engines/Makefile.inc	(revision 361700)
@@ -1,20 +1,20 @@
 # $FreeBSD$
 
-SHLIBDIR?= /usr/lib/engines
+SHLIBDIR=	${LIBDIR}/engines
 
 LCRYPTO_SRC=	${SRCTOP}/crypto/openssl
 
 CFLAGS+=	-I${LCRYPTO_SRC}/engines
 CFLAGS+=	-I${LCRYPTO_SRC}/include
 CFLAGS+=	-I${OBJTOP}/secure/lib/libcrypto
 
 .include <bsd.endian.mk>
 
 .if ${TARGET_ENDIANNESS} == 1234
 CFLAGS+=	-DL_ENDIAN
 .elif ${TARGET_ENDIANNESS} == 4321
 CFLAGS+=	-DB_ENDIAN
 .endif
 CFLAGS+=	-DNDEBUG
 
 .PATH: ${LCRYPTO_SRC}/engines