diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index f8325332d6db..25c4ee449eda 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -459,7 +459,7 @@ opensslconf.h: opensslconf.h.in
 PICFLAG+=	-DOPENSSL_PIC
 
 .if defined(ASM_${MACHINE_CPUARCH})
-.PATH:	${.CURDIR}/${MACHINE_CPUARCH}
+.PATH:	${SRCTOP}/sys/crypto/openssl/${MACHINE_CPUARCH}
 .if defined(ASM_amd64)
 .PATH:	${LCRYPTO_SRC}/crypto/bn/asm
 .endif
diff --git a/secure/lib/libcrypto/engines/padlock/Makefile b/secure/lib/libcrypto/engines/padlock/Makefile
index b7b72ac076aa..0dbe5bd2a390 100644
--- a/secure/lib/libcrypto/engines/padlock/Makefile
+++ b/secure/lib/libcrypto/engines/padlock/Makefile
@@ -11,4 +11,4 @@ SRCS+=	e_padlock-x86.S
 
 .include <bsd.lib.mk>
 
-.PATH:	${.CURDIR:H:H}/${MACHINE_CPUARCH}
+.PATH:	${SRCTOP}/sys/crypto/openssl/${MACHINE_CPUARCH}
diff --git a/secure/lib/libcrypto/aarch64/aesv8-armx.S b/sys/crypto/openssl/aarch64/aesv8-armx.S
similarity index 100%
rename from secure/lib/libcrypto/aarch64/aesv8-armx.S
rename to sys/crypto/openssl/aarch64/aesv8-armx.S
diff --git a/secure/lib/libcrypto/aarch64/arm64cpuid.S b/sys/crypto/openssl/aarch64/arm64cpuid.S
similarity index 100%
rename from secure/lib/libcrypto/aarch64/arm64cpuid.S
rename to sys/crypto/openssl/aarch64/arm64cpuid.S
diff --git a/secure/lib/libcrypto/aarch64/armv8-mont.S b/sys/crypto/openssl/aarch64/armv8-mont.S
similarity index 100%
rename from secure/lib/libcrypto/aarch64/armv8-mont.S
rename to sys/crypto/openssl/aarch64/armv8-mont.S
diff --git a/secure/lib/libcrypto/aarch64/chacha-armv8.S b/sys/crypto/openssl/aarch64/chacha-armv8.S
similarity index 100%
rename from secure/lib/libcrypto/aarch64/chacha-armv8.S
rename to sys/crypto/openssl/aarch64/chacha-armv8.S
diff --git a/secure/lib/libcrypto/aarch64/ecp_nistz256-armv8.S b/sys/crypto/openssl/aarch64/ecp_nistz256-armv8.S
similarity index 100%
rename from secure/lib/libcrypto/aarch64/ecp_nistz256-armv8.S
rename to sys/crypto/openssl/aarch64/ecp_nistz256-armv8.S
diff --git a/secure/lib/libcrypto/aarch64/ghashv8-armx.S b/sys/crypto/openssl/aarch64/ghashv8-armx.S
similarity index 100%
rename from secure/lib/libcrypto/aarch64/ghashv8-armx.S
rename to sys/crypto/openssl/aarch64/ghashv8-armx.S
diff --git a/secure/lib/libcrypto/aarch64/keccak1600-armv8.S b/sys/crypto/openssl/aarch64/keccak1600-armv8.S
similarity index 100%
rename from secure/lib/libcrypto/aarch64/keccak1600-armv8.S
rename to sys/crypto/openssl/aarch64/keccak1600-armv8.S
diff --git a/secure/lib/libcrypto/aarch64/poly1305-armv8.S b/sys/crypto/openssl/aarch64/poly1305-armv8.S
similarity index 100%
rename from secure/lib/libcrypto/aarch64/poly1305-armv8.S
rename to sys/crypto/openssl/aarch64/poly1305-armv8.S
diff --git a/secure/lib/libcrypto/aarch64/sha1-armv8.S b/sys/crypto/openssl/aarch64/sha1-armv8.S
similarity index 100%
rename from secure/lib/libcrypto/aarch64/sha1-armv8.S
rename to sys/crypto/openssl/aarch64/sha1-armv8.S
diff --git a/secure/lib/libcrypto/aarch64/sha256-armv8.S b/sys/crypto/openssl/aarch64/sha256-armv8.S
similarity index 100%
rename from secure/lib/libcrypto/aarch64/sha256-armv8.S
rename to sys/crypto/openssl/aarch64/sha256-armv8.S
diff --git a/secure/lib/libcrypto/aarch64/sha512-armv8.S b/sys/crypto/openssl/aarch64/sha512-armv8.S
similarity index 100%
rename from secure/lib/libcrypto/aarch64/sha512-armv8.S
rename to sys/crypto/openssl/aarch64/sha512-armv8.S
diff --git a/secure/lib/libcrypto/aarch64/vpaes-armv8.S b/sys/crypto/openssl/aarch64/vpaes-armv8.S
similarity index 100%
rename from secure/lib/libcrypto/aarch64/vpaes-armv8.S
rename to sys/crypto/openssl/aarch64/vpaes-armv8.S
diff --git a/secure/lib/libcrypto/amd64/aesni-gcm-x86_64.S b/sys/crypto/openssl/amd64/aesni-gcm-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/aesni-gcm-x86_64.S
rename to sys/crypto/openssl/amd64/aesni-gcm-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/aesni-mb-x86_64.S b/sys/crypto/openssl/amd64/aesni-mb-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/aesni-mb-x86_64.S
rename to sys/crypto/openssl/amd64/aesni-mb-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/aesni-sha1-x86_64.S b/sys/crypto/openssl/amd64/aesni-sha1-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/aesni-sha1-x86_64.S
rename to sys/crypto/openssl/amd64/aesni-sha1-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/aesni-sha256-x86_64.S b/sys/crypto/openssl/amd64/aesni-sha256-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/aesni-sha256-x86_64.S
rename to sys/crypto/openssl/amd64/aesni-sha256-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/aesni-x86_64.S b/sys/crypto/openssl/amd64/aesni-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/aesni-x86_64.S
rename to sys/crypto/openssl/amd64/aesni-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/chacha-x86_64.S b/sys/crypto/openssl/amd64/chacha-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/chacha-x86_64.S
rename to sys/crypto/openssl/amd64/chacha-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/cmll-x86_64.S b/sys/crypto/openssl/amd64/cmll-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/cmll-x86_64.S
rename to sys/crypto/openssl/amd64/cmll-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/e_padlock-x86_64.S b/sys/crypto/openssl/amd64/e_padlock-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/e_padlock-x86_64.S
rename to sys/crypto/openssl/amd64/e_padlock-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S b/sys/crypto/openssl/amd64/ecp_nistz256-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S
rename to sys/crypto/openssl/amd64/ecp_nistz256-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/ghash-x86_64.S b/sys/crypto/openssl/amd64/ghash-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/ghash-x86_64.S
rename to sys/crypto/openssl/amd64/ghash-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/keccak1600-x86_64.S b/sys/crypto/openssl/amd64/keccak1600-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/keccak1600-x86_64.S
rename to sys/crypto/openssl/amd64/keccak1600-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/md5-x86_64.S b/sys/crypto/openssl/amd64/md5-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/md5-x86_64.S
rename to sys/crypto/openssl/amd64/md5-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/poly1305-x86_64.S b/sys/crypto/openssl/amd64/poly1305-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/poly1305-x86_64.S
rename to sys/crypto/openssl/amd64/poly1305-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/rc4-md5-x86_64.S b/sys/crypto/openssl/amd64/rc4-md5-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/rc4-md5-x86_64.S
rename to sys/crypto/openssl/amd64/rc4-md5-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/rc4-x86_64.S b/sys/crypto/openssl/amd64/rc4-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/rc4-x86_64.S
rename to sys/crypto/openssl/amd64/rc4-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/rsaz-avx2.S b/sys/crypto/openssl/amd64/rsaz-avx2.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/rsaz-avx2.S
rename to sys/crypto/openssl/amd64/rsaz-avx2.S
diff --git a/secure/lib/libcrypto/amd64/rsaz-x86_64.S b/sys/crypto/openssl/amd64/rsaz-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/rsaz-x86_64.S
rename to sys/crypto/openssl/amd64/rsaz-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/sha1-mb-x86_64.S b/sys/crypto/openssl/amd64/sha1-mb-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/sha1-mb-x86_64.S
rename to sys/crypto/openssl/amd64/sha1-mb-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/sha1-x86_64.S b/sys/crypto/openssl/amd64/sha1-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/sha1-x86_64.S
rename to sys/crypto/openssl/amd64/sha1-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/sha256-mb-x86_64.S b/sys/crypto/openssl/amd64/sha256-mb-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/sha256-mb-x86_64.S
rename to sys/crypto/openssl/amd64/sha256-mb-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/sha256-x86_64.S b/sys/crypto/openssl/amd64/sha256-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/sha256-x86_64.S
rename to sys/crypto/openssl/amd64/sha256-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/sha512-x86_64.S b/sys/crypto/openssl/amd64/sha512-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/sha512-x86_64.S
rename to sys/crypto/openssl/amd64/sha512-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/vpaes-x86_64.S b/sys/crypto/openssl/amd64/vpaes-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/vpaes-x86_64.S
rename to sys/crypto/openssl/amd64/vpaes-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/wp-x86_64.S b/sys/crypto/openssl/amd64/wp-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/wp-x86_64.S
rename to sys/crypto/openssl/amd64/wp-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/x25519-x86_64.S b/sys/crypto/openssl/amd64/x25519-x86_64.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/x25519-x86_64.S
rename to sys/crypto/openssl/amd64/x25519-x86_64.S
diff --git a/secure/lib/libcrypto/amd64/x86_64-gf2m.S b/sys/crypto/openssl/amd64/x86_64-gf2m.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/x86_64-gf2m.S
rename to sys/crypto/openssl/amd64/x86_64-gf2m.S
diff --git a/secure/lib/libcrypto/amd64/x86_64-mont.S b/sys/crypto/openssl/amd64/x86_64-mont.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/x86_64-mont.S
rename to sys/crypto/openssl/amd64/x86_64-mont.S
diff --git a/secure/lib/libcrypto/amd64/x86_64-mont5.S b/sys/crypto/openssl/amd64/x86_64-mont5.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/x86_64-mont5.S
rename to sys/crypto/openssl/amd64/x86_64-mont5.S
diff --git a/secure/lib/libcrypto/amd64/x86_64cpuid.S b/sys/crypto/openssl/amd64/x86_64cpuid.S
similarity index 100%
rename from secure/lib/libcrypto/amd64/x86_64cpuid.S
rename to sys/crypto/openssl/amd64/x86_64cpuid.S
diff --git a/secure/lib/libcrypto/arm/aes-armv4.S b/sys/crypto/openssl/arm/aes-armv4.S
similarity index 100%
rename from secure/lib/libcrypto/arm/aes-armv4.S
rename to sys/crypto/openssl/arm/aes-armv4.S
diff --git a/secure/lib/libcrypto/arm/aesv8-armx.S b/sys/crypto/openssl/arm/aesv8-armx.S
similarity index 100%
rename from secure/lib/libcrypto/arm/aesv8-armx.S
rename to sys/crypto/openssl/arm/aesv8-armx.S
diff --git a/secure/lib/libcrypto/arm/armv4-gf2m.S b/sys/crypto/openssl/arm/armv4-gf2m.S
similarity index 100%
rename from secure/lib/libcrypto/arm/armv4-gf2m.S
rename to sys/crypto/openssl/arm/armv4-gf2m.S
diff --git a/secure/lib/libcrypto/arm/armv4-mont.S b/sys/crypto/openssl/arm/armv4-mont.S
similarity index 100%
rename from secure/lib/libcrypto/arm/armv4-mont.S
rename to sys/crypto/openssl/arm/armv4-mont.S
diff --git a/secure/lib/libcrypto/arm/armv4cpuid.S b/sys/crypto/openssl/arm/armv4cpuid.S
similarity index 100%
rename from secure/lib/libcrypto/arm/armv4cpuid.S
rename to sys/crypto/openssl/arm/armv4cpuid.S
diff --git a/secure/lib/libcrypto/arm/bsaes-armv7.S b/sys/crypto/openssl/arm/bsaes-armv7.S
similarity index 100%
rename from secure/lib/libcrypto/arm/bsaes-armv7.S
rename to sys/crypto/openssl/arm/bsaes-armv7.S
diff --git a/secure/lib/libcrypto/arm/chacha-armv4.S b/sys/crypto/openssl/arm/chacha-armv4.S
similarity index 100%
rename from secure/lib/libcrypto/arm/chacha-armv4.S
rename to sys/crypto/openssl/arm/chacha-armv4.S
diff --git a/secure/lib/libcrypto/arm/ecp_nistz256-armv4.S b/sys/crypto/openssl/arm/ecp_nistz256-armv4.S
similarity index 100%
rename from secure/lib/libcrypto/arm/ecp_nistz256-armv4.S
rename to sys/crypto/openssl/arm/ecp_nistz256-armv4.S
diff --git a/secure/lib/libcrypto/arm/ghash-armv4.S b/sys/crypto/openssl/arm/ghash-armv4.S
similarity index 100%
rename from secure/lib/libcrypto/arm/ghash-armv4.S
rename to sys/crypto/openssl/arm/ghash-armv4.S
diff --git a/secure/lib/libcrypto/arm/ghashv8-armx.S b/sys/crypto/openssl/arm/ghashv8-armx.S
similarity index 100%
rename from secure/lib/libcrypto/arm/ghashv8-armx.S
rename to sys/crypto/openssl/arm/ghashv8-armx.S
diff --git a/secure/lib/libcrypto/arm/keccak1600-armv4.S b/sys/crypto/openssl/arm/keccak1600-armv4.S
similarity index 100%
rename from secure/lib/libcrypto/arm/keccak1600-armv4.S
rename to sys/crypto/openssl/arm/keccak1600-armv4.S
diff --git a/secure/lib/libcrypto/arm/poly1305-armv4.S b/sys/crypto/openssl/arm/poly1305-armv4.S
similarity index 100%
rename from secure/lib/libcrypto/arm/poly1305-armv4.S
rename to sys/crypto/openssl/arm/poly1305-armv4.S
diff --git a/secure/lib/libcrypto/arm/sha1-armv4-large.S b/sys/crypto/openssl/arm/sha1-armv4-large.S
similarity index 100%
rename from secure/lib/libcrypto/arm/sha1-armv4-large.S
rename to sys/crypto/openssl/arm/sha1-armv4-large.S
diff --git a/secure/lib/libcrypto/arm/sha256-armv4.S b/sys/crypto/openssl/arm/sha256-armv4.S
similarity index 100%
rename from secure/lib/libcrypto/arm/sha256-armv4.S
rename to sys/crypto/openssl/arm/sha256-armv4.S
diff --git a/secure/lib/libcrypto/arm/sha512-armv4.S b/sys/crypto/openssl/arm/sha512-armv4.S
similarity index 100%
rename from secure/lib/libcrypto/arm/sha512-armv4.S
rename to sys/crypto/openssl/arm/sha512-armv4.S
diff --git a/secure/lib/libcrypto/i386/aesni-x86.S b/sys/crypto/openssl/i386/aesni-x86.S
similarity index 100%
rename from secure/lib/libcrypto/i386/aesni-x86.S
rename to sys/crypto/openssl/i386/aesni-x86.S
diff --git a/secure/lib/libcrypto/i386/bf-586.S b/sys/crypto/openssl/i386/bf-586.S
similarity index 100%
rename from secure/lib/libcrypto/i386/bf-586.S
rename to sys/crypto/openssl/i386/bf-586.S
diff --git a/secure/lib/libcrypto/i386/bn-586.S b/sys/crypto/openssl/i386/bn-586.S
similarity index 100%
rename from secure/lib/libcrypto/i386/bn-586.S
rename to sys/crypto/openssl/i386/bn-586.S
diff --git a/secure/lib/libcrypto/i386/cast-586.S b/sys/crypto/openssl/i386/cast-586.S
similarity index 100%
rename from secure/lib/libcrypto/i386/cast-586.S
rename to sys/crypto/openssl/i386/cast-586.S
diff --git a/secure/lib/libcrypto/i386/chacha-x86.S b/sys/crypto/openssl/i386/chacha-x86.S
similarity index 100%
rename from secure/lib/libcrypto/i386/chacha-x86.S
rename to sys/crypto/openssl/i386/chacha-x86.S
diff --git a/secure/lib/libcrypto/i386/cmll-x86.S b/sys/crypto/openssl/i386/cmll-x86.S
similarity index 100%
rename from secure/lib/libcrypto/i386/cmll-x86.S
rename to sys/crypto/openssl/i386/cmll-x86.S
diff --git a/secure/lib/libcrypto/i386/co-586.S b/sys/crypto/openssl/i386/co-586.S
similarity index 100%
rename from secure/lib/libcrypto/i386/co-586.S
rename to sys/crypto/openssl/i386/co-586.S
diff --git a/secure/lib/libcrypto/i386/crypt586.S b/sys/crypto/openssl/i386/crypt586.S
similarity index 100%
rename from secure/lib/libcrypto/i386/crypt586.S
rename to sys/crypto/openssl/i386/crypt586.S
diff --git a/secure/lib/libcrypto/i386/des-586.S b/sys/crypto/openssl/i386/des-586.S
similarity index 100%
rename from secure/lib/libcrypto/i386/des-586.S
rename to sys/crypto/openssl/i386/des-586.S
diff --git a/secure/lib/libcrypto/i386/e_padlock-x86.S b/sys/crypto/openssl/i386/e_padlock-x86.S
similarity index 100%
rename from secure/lib/libcrypto/i386/e_padlock-x86.S
rename to sys/crypto/openssl/i386/e_padlock-x86.S
diff --git a/secure/lib/libcrypto/i386/ecp_nistz256-x86.S b/sys/crypto/openssl/i386/ecp_nistz256-x86.S
similarity index 100%
rename from secure/lib/libcrypto/i386/ecp_nistz256-x86.S
rename to sys/crypto/openssl/i386/ecp_nistz256-x86.S
diff --git a/secure/lib/libcrypto/i386/ghash-x86.S b/sys/crypto/openssl/i386/ghash-x86.S
similarity index 100%
rename from secure/lib/libcrypto/i386/ghash-x86.S
rename to sys/crypto/openssl/i386/ghash-x86.S
diff --git a/secure/lib/libcrypto/i386/md5-586.S b/sys/crypto/openssl/i386/md5-586.S
similarity index 100%
rename from secure/lib/libcrypto/i386/md5-586.S
rename to sys/crypto/openssl/i386/md5-586.S
diff --git a/secure/lib/libcrypto/i386/poly1305-x86.S b/sys/crypto/openssl/i386/poly1305-x86.S
similarity index 100%
rename from secure/lib/libcrypto/i386/poly1305-x86.S
rename to sys/crypto/openssl/i386/poly1305-x86.S
diff --git a/secure/lib/libcrypto/i386/rc4-586.S b/sys/crypto/openssl/i386/rc4-586.S
similarity index 100%
rename from secure/lib/libcrypto/i386/rc4-586.S
rename to sys/crypto/openssl/i386/rc4-586.S
diff --git a/secure/lib/libcrypto/i386/rc5-586.S b/sys/crypto/openssl/i386/rc5-586.S
similarity index 100%
rename from secure/lib/libcrypto/i386/rc5-586.S
rename to sys/crypto/openssl/i386/rc5-586.S
diff --git a/secure/lib/libcrypto/i386/rmd-586.S b/sys/crypto/openssl/i386/rmd-586.S
similarity index 100%
rename from secure/lib/libcrypto/i386/rmd-586.S
rename to sys/crypto/openssl/i386/rmd-586.S
diff --git a/secure/lib/libcrypto/i386/sha1-586.S b/sys/crypto/openssl/i386/sha1-586.S
similarity index 100%
rename from secure/lib/libcrypto/i386/sha1-586.S
rename to sys/crypto/openssl/i386/sha1-586.S
diff --git a/secure/lib/libcrypto/i386/sha256-586.S b/sys/crypto/openssl/i386/sha256-586.S
similarity index 100%
rename from secure/lib/libcrypto/i386/sha256-586.S
rename to sys/crypto/openssl/i386/sha256-586.S
diff --git a/secure/lib/libcrypto/i386/sha512-586.S b/sys/crypto/openssl/i386/sha512-586.S
similarity index 100%
rename from secure/lib/libcrypto/i386/sha512-586.S
rename to sys/crypto/openssl/i386/sha512-586.S
diff --git a/secure/lib/libcrypto/i386/vpaes-x86.S b/sys/crypto/openssl/i386/vpaes-x86.S
similarity index 100%
rename from secure/lib/libcrypto/i386/vpaes-x86.S
rename to sys/crypto/openssl/i386/vpaes-x86.S
diff --git a/secure/lib/libcrypto/i386/wp-mmx.S b/sys/crypto/openssl/i386/wp-mmx.S
similarity index 100%
rename from secure/lib/libcrypto/i386/wp-mmx.S
rename to sys/crypto/openssl/i386/wp-mmx.S
diff --git a/secure/lib/libcrypto/i386/x86-gf2m.S b/sys/crypto/openssl/i386/x86-gf2m.S
similarity index 100%
rename from secure/lib/libcrypto/i386/x86-gf2m.S
rename to sys/crypto/openssl/i386/x86-gf2m.S
diff --git a/secure/lib/libcrypto/i386/x86-mont.S b/sys/crypto/openssl/i386/x86-mont.S
similarity index 100%
rename from secure/lib/libcrypto/i386/x86-mont.S
rename to sys/crypto/openssl/i386/x86-mont.S
diff --git a/secure/lib/libcrypto/i386/x86cpuid.S b/sys/crypto/openssl/i386/x86cpuid.S
similarity index 100%
rename from secure/lib/libcrypto/i386/x86cpuid.S
rename to sys/crypto/openssl/i386/x86cpuid.S