diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
index aae341f13211..c0e216576b4a 100644
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -74,7 +74,7 @@ CFLAGS+= \
 	-include ${SRCTOP}/sys/modules/zfs/zfs_config.h \
 	-I${SRCTOP}/sys/modules/zfs
 
-LIBADD=	jail avl nvpair geom  uutil zfs_core spl tpool zutil zfs m crypto
+LIBADD=	jail avl nvpair geom  uutil zfs_core spl tpool zutil zfs m
 LDADD+=	-pthread
 .include <bsd.prog.mk>
 
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index a1f519431f63..3b711430af7a 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -213,22 +213,22 @@ SRCS+=	ec_ameth.c ec_asn1.c ec_backend.c ec_check.c ec_curve.c ec_cvt.c
 SRCS+=	ec_deprecated.c ec_err.c ec_key.c ec_kmeth.c ec_lib.c ec_mult.c ec_oct.c
 SRCS+=	ec_pmeth.c ec_print.c ecdh_kdf.c ecdh_ossl.c ecdsa_ossl.c ecdsa_sign.c
 SRCS+=	ecdsa_vrf.c eck_prn.c ecp_mont.c ecp_nist.c
+SRCS+=	ecp_nistp224.c ecp_nistz256.c ecp_nistp256.c ecp_nistp521.c
+SRCS+=	ecp_nistputil.c
 SRCS+=	ecp_oct.c ecp_smpl.c ecx_backend.c ecx_key.c ecx_meth.c eddsa.c
 SRCS+=	f_generic.c f_impl32.c f_impl64.c scalar.c
 .if defined(ASM_aarch64)
-SRCS+=	ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c
-SRCS+=	ecp_nistz256-armv8.S ecp_nistz256.c
+SRCS+=	ecp_nistz256-armv8.S
 .elif defined(ASM_amd64)
-SRCS+=	ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c
-SRCS+=	ecp_nistz256-x86_64.S ecp_nistz256.c x25519-x86_64.S
+SRCS+=	ecp_nistz256-x86_64.S x25519-x86_64.S
 .elif defined(ASM_arm)
-SRCS+=	ecp_nistz256-armv4.S ecp_nistz256.c
+SRCS+=	ecp_nistz256-armv4.S
 .elif defined(ASM_i386)
-SRCS+=	ecp_nistz256-x86.S ecp_nistz256.c
+SRCS+=	ecp_nistz256-x86.S
 .elif defined(ASM_powerpc64)
-SRCS+=	ecp_nistp521-ppc64.S ecp_nistz256-ppc64.S ecp_nistz256.c ecp_ppc.c x25519-ppc64.S
+SRCS+=	ecp_nistp521-ppc64.S ecp_nistz256-ppc64.S ecp_ppc.c x25519-ppc64.S
 .elif defined(ASM_powerpc64le)
-SRCS+=	ecp_nistp521-ppc64.S ecp_nistz256-ppc64.S ecp_nistz256.c ecp_ppc.c x25519-ppc64.S
+SRCS+=	ecp_nistp521-ppc64.S ecp_nistz256-ppc64.S ecp_ppc.c x25519-ppc64.S
 .endif
 
 # encode_decode