diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index f4bd4a3247f..ab9044ad67f 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -606,6 +606,13 @@ buildinf.h: Makefile
 	echo "static const char compiler_flags[] = \"compiler: ${COMPILER_TYPE}\";" ) \
 	> ${.TARGET}
 
+buildasm cleanasm:
+.for arch in aarch64 amd64 arm i386 powerpc powerpc64 powerpc64le
+	make MK_AUTO_OBJ=no -DWITHOUT_AUTO_ASM -DASM_${arch} \
+	    -f ${.CURDIR}/Makefile.asm -C ${SRCTOP}/sys/crypto/openssl/${arch} \
+	    ${.TARGET:S/build/all/:S/asm$//}
+.endfor
+
 .include <bsd.lib.mk>
 
 PICFLAG+=	-DOPENSSL_PIC
diff --git a/secure/lib/libcrypto/Makefile.common b/secure/lib/libcrypto/Makefile.common
index a52e2979060..b109fd7f7f4 100644
--- a/secure/lib/libcrypto/Makefile.common
+++ b/secure/lib/libcrypto/Makefile.common
@@ -7,6 +7,7 @@ CFLAGS+=	-DL_ENDIAN
 CFLAGS+=	-DB_ENDIAN
 .endif
 
+.ifndef WITHOUT_AUTO_ASM
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
     ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386"
 ASM_${MACHINE_CPUARCH}=
@@ -14,6 +15,7 @@ ASM_${MACHINE_CPUARCH}=
     ${MACHINE_ARCH} == "powerpc64le"
 ASM_${MACHINE_ARCH}=
 .endif
+.endif
 
 .if defined(ASM_${MACHINE_CPUARCH}) || defined(ASM_${MACHINE_ARCH})
 CFLAGS+=	-DOPENSSL_CPUID_OBJ