diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/whrlpool.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/whrlpool.inc
deleted file mode 100644
index eb655bb31992..000000000000
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/whrlpool.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: whrlpool.inc,v 1.1 2023/05/11 01:31:54 christos Exp $
-
-WHRLPOOL_SRCS += wp_block.c
-.include "../../whrlpool.inc"
-
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
index 80f192750d04..13fa323d980d 100644
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
@@ -8,4 +8,6 @@ AFLAGS.ecp_nistz256-sparcv9.S += -Wa,-Av9
 .else
 .endif
 
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
 .include "../../ec.inc"
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/chacha.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/chacha.inc
deleted file mode 100644
index 66471806409c..000000000000
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/chacha.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: chacha.inc,v 1.1 2023/05/11 01:45:38 christos Exp $
-
-CHACHA_SRCS += chacha_enc.c
-.include "../../chacha.inc"
-
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/whrlpool.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/whrlpool.inc
deleted file mode 100644
index bbf5d441e8ce..000000000000
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/whrlpool.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: whrlpool.inc,v 1.1 2023/05/11 01:45:38 christos Exp $
-
-WHRLPOOL_SRCS += wp_block.c
-.include "../../whrlpool.inc"
-
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc
index 991b52cc2883..6668d5997a8c 100644
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc
@@ -2,5 +2,7 @@
 
 #CRYPTO_SRCS += libc-memequal.c
 #CPPFLAGS += -DOPENSSL_CPUID_OBJ
+COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS	# no atomic 64 bit ops
+
 
 .include "../../crypto.inc"
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/ec.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/ec.inc
new file mode 100644
index 000000000000..dbb103b1d4ed
--- /dev/null
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/ec.inc
@@ -0,0 +1,2 @@
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+.include "../../ec.inc"
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc
index 0f82a081d147..651e6620974c 100644
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc
@@ -1,4 +1,4 @@
 .PATH.S: ${.PARSEDIR}
-WHRLPOOL_SRCS = wp-x86_64.S
+WHRLPOOL_SRCS += wp-x86_64.S
 WHRLPOOLCPPFLAGS+=	-DWHIRLPOOL_ASM
 .include "../../whrlpool.inc"
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc b/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc
index fe393d9e1993..90012c2243e8 100644
--- a/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc
+++ b/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc
@@ -1,8 +1,8 @@
-#	$NetBSD: chacha.inc,v 1.3 2023/05/06 17:07:22 christos Exp $
+#	$NetBSD: chacha.inc,v 1.4 2023/05/11 20:08:59 christos Exp $
 
 .PATH:	${OPENSSLSRC}/crypto/chacha
 
-CHACHA_SRCS += \
+CHACHA_SRCS ?= chacha_enc.c
 
 SRCS += ${CHACHA_SRCS}
 
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/ec.inc b/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
index b20d9151b0a8..604d043cc84b 100644
--- a/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
+++ b/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: ec.inc,v 1.10 2023/05/11 15:26:13 christos Exp $
+#	$NetBSD: ec.inc,v 1.11 2023/05/11 20:08:59 christos Exp $
 
 .PATH:	${OPENSSLSRC}/crypto/ec
 
@@ -38,8 +38,10 @@ ecx_meth.c \
 .if defined(ECNI)
 COPTS.ecp_nistz256.c+=-Wno-error=stack-protector
 EC_SRCS+= ecp_nistz256.c
+.if empty(ECCPPFLAGS:M*OPENSSL_NO_EC_NISTP_64_GCC_128*)
 EC_SRCS+= ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c
 .endif
+.endif
 
 SRCS += ${EC_SRCS}
 
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc b/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc
index 413505093066..c7a1a1417cf6 100644
--- a/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc
+++ b/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc
@@ -1,7 +1,8 @@
-#	$NetBSD: whrlpool.inc,v 1.3 2023/05/06 17:07:23 christos Exp $
+#	$NetBSD: whrlpool.inc,v 1.4 2023/05/11 20:08:59 christos Exp $
 
 .PATH:	${OPENSSLSRC}/crypto/whrlpool
 
+WHRLPOOL_SRCS ?= wp_block.c
 WHRLPOOL_SRCS += \
 wp_dgst.c \