diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm
--- a/secure/lib/libcrypto/Makefile.asm
+++ b/secure/lib/libcrypto/Makefile.asm
@@ -45,8 +45,9 @@
 ASM=	${SRCS:R:S/$/.S/} sha256-armv8.S
 
 all:	${ASM}
+	rm -f ${ASM:R:S/$/.s/}
 
-CLEANFILES=	${ASM} ${SRCS:R:S/$/.s/} sha256-armv8.s
+CLEANFILES=	${ASM}
 .SUFFIXES:	.pl
 
 sha256-armv8.S:	sha512-armv8.pl
@@ -125,8 +126,9 @@
 ASM=	${SRCS:R:S/$/.S/} ${SHA_ASM:S/$/.S/}
 
 all:	${ASM}
+	rm -f ${SHA_TMP}
 
-CLEANFILES=	${ASM} ${SHA_ASM:S/$/.s/}
+CLEANFILES=	${ASM}
 .SUFFIXES:	.pl
 
 .pl.S:
@@ -179,17 +181,14 @@
 # sha
 SRCS+=	keccak1600-armv4.pl sha1-armv4-large.pl sha256-armv4.pl sha512-armv4.pl
 
-ASM=	aes-armv4.S ${SRCS:R:S/$/.S/}
+ASM=	${SRCS:R:S/$/.S/}
 
 all:	${ASM}
+	rm -f ${ASM:R:S/$/.s/}	
 
-CLEANFILES=	${ASM} ${SRCS:R:S/$/.s/}
+CLEANFILES=	${ASM}
 .SUFFIXES:	.pl
 
-aes-armv4.S:	aes-armv4.pl
-	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
-	env CC=cc perl ${.ALLSRC} linux32 ) > ${.TARGET}
-
 .pl.S:
 	env CC=cc perl ${.IMPSRC} linux32 ${.TARGET:R:S/$/.s/}
 	( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\
@@ -217,6 +216,7 @@
 	${LCRYPTO_SRC}/engines/asm
 
 #PERLPATH=	-I${LCRYPTO_SRC}/crypto/des/asm -I${LCRYPTO_SRC}/crypto/perlasm
+CFLAGS=	-DOPENSSL_IA32_SSE2
 
 # cpuid
 SRCS=	x86cpuid.pl
@@ -276,17 +276,15 @@
 
 all:	${ASM}
 
-CLEANFILES=	${ASM} ${SRCS:R:S/$/.s/}
+CLEANFILES=	${ASM}
 .SUFFIXES:	.pl
 
 .pl.S:
 	( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\
 	echo '#ifdef PIC' ;\
-	env CC=cc perl ${PERLPATH} ${.IMPSRC} elf ${CFLAGS} -fpic -DPIC ${.IMPSRC:R:S/$/.s/} ;\
-	cat ${.IMPSRC:R:S/$/.s/} ;\
+	env CC=cc perl ${PERLPATH} ${.IMPSRC} elf ${CFLAGS} -fpic /dev/stdout ;\
 	echo '#else' ;\
-	env CC=cc perl ${PERLPATH} ${.IMPSRC} elf ${CFLAGS} ${.IMPSRC:R:S/$/.s/} ;\
-	cat ${.IMPSRC:R:S/$/.s/} ;\
+	env CC=cc perl ${PERLPATH} ${.IMPSRC} elf ${CFLAGS} /dev/stdout ;\
 	echo '#endif' ) > ${.TARGET}
 
 .elif defined(ASM_powerpc)
@@ -325,6 +323,7 @@
 ASM=	${SRCS:R:S/$/.S/} bn-ppc.S sha256-ppc.S sha256p8-ppc.S
 
 all:	${ASM}
+	rm -f ${ASM:R:S/$/.s/}
 
 CLEANFILES=	${ASM}
 .SUFFIXES:	.pl
@@ -392,6 +391,7 @@
 ASM=	${SRCS:R:S/$/.S/} bn-ppc.S sha256-ppc.S sha256p8-ppc.S
 
 all:	${ASM}
+	rm -f ${ASM:R:S/$/.s/}
 
 CLEANFILES=	${ASM}
 .SUFFIXES:	.pl
@@ -459,6 +459,7 @@
 ASM=	${SRCS:R:S/$/.S/} bn-ppc.S sha256-ppc.S sha256p8-ppc.S
 
 all:	${ASM}
+	rm -f ${ASM:R:S/$/.s/}
 
 CLEANFILES=	${ASM}
 .SUFFIXES:	.pl