diff --git a/security/nettle/Makefile b/security/nettle/Makefile
index 57ca439f03aa..2242322e6c36 100644
--- a/security/nettle/Makefile
+++ b/security/nettle/Makefile
@@ -1,67 +1,64 @@
 # Created by: ijliao
 
 PORTNAME=	nettle
-PORTVERSION=	3.7.3
+PORTVERSION=	3.8
 CATEGORIES=	security
 MASTER_SITES=	GNU \
 		https://www.lysator.liu.se/~nisse/archive/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Low-level cryptographic library
 
 LICENSE=	GPLv2+ LGPL3
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYINGv2
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LESSERv3
 
 BUILD_DEPENDS=	gmp>=6.1.0:math/gmp
 LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		compiler:c11 cpe gmake localbase makeinfo pathfix
 
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=	M4="/usr/bin/m4 -g"
 GNU_CONFIGURE=	yes
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
-CPE_VENDOR=	nettle_project
 
 INFO=		nettle
 
+CPE_VENDOR=	nettle_project
+
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 EXAMPLES_CFLAGS=	-I${OPENSSLINC}
 EXAMPLES_USES=		ssl
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "sparc64"
 CONFIGURE_ENV+=	CCPIC=-fPIC
 .endif
 
-.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-powerpc64_machine.m4
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/libdir=/ s|lib32|lib|' ${WRKSRC}/configure
 .if ${ARCH} == "mips64"
 	@${REINPLACE_CMD} -e 's|__sgi|__unix__|' ${WRKSRC}/configure
 .endif
 
 post-patch-EXAMPLES-off:
 	@${REINPLACE_CMD} -e '/SUBDIRS = / s| examples||' ${WRKSRC}/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} NEWS README nettle.html nettle.pdf ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${INSTALL_PROGRAM} base16dec base16enc base64dec base64enc ecc-benchmark hogweed-benchmark nettle-benchmark random-prime rsa-decrypt rsa-encrypt rsa-keygen rsa-sign rsa-verify ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.[ch] ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/security/nettle/distinfo b/security/nettle/distinfo
index e0bcb43ae699..713ec2bb06d8 100644
--- a/security/nettle/distinfo
+++ b/security/nettle/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622214002
-SHA256 (nettle-3.7.3.tar.gz) = 661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0
-SIZE (nettle-3.7.3.tar.gz) = 2383985
+TIMESTAMP = 1654275835
+SHA256 (nettle-3.8.tar.gz) = 7576c68481c198f644b08c160d1a4850ba9449e308069455b5213319f234e8e6
+SIZE (nettle-3.8.tar.gz) = 2404258
diff --git a/security/nettle/files/extra-patch-powerpc64_machine.m4 b/security/nettle/files/extra-patch-powerpc64_machine.m4
deleted file mode 100644
index e0bcdbd34fd2..000000000000
--- a/security/nettle/files/extra-patch-powerpc64_machine.m4
+++ /dev/null
@@ -1,32 +0,0 @@
---- powerpc64/machine.m4.old	2021-04-18 10:51:29.072176000 -0500
-+++ powerpc64/machine.m4	2021-04-18 11:45:30.583315000 -0500
-@@ -1,26 +1,15 @@
- define(`PROLOGUE',
- `.globl C_NAME($1)
- DECLARE_FUNC(C_NAME($1))
--ifelse(WORDS_BIGENDIAN,no,
--`ifdef(`FUNC_ALIGN',`.align FUNC_ALIGN')
-+ifdef(`FUNC_ALIGN',`.align FUNC_ALIGN')
- C_NAME($1):
- addis 2,12,(.TOC.-C_NAME($1))@ha
- addi 2,2,(.TOC.-C_NAME($1))@l
--.localentry C_NAME($1), .-C_NAME($1)',
--`.section ".opd","aw"
--.align 3
--C_NAME($1):
--.quad .C_NAME($1),.TOC.@tocbase,0
--.previous
--ifdef(`FUNC_ALIGN',`.align FUNC_ALIGN')
--.C_NAME($1):')
-+.localentry C_NAME($1), .-C_NAME($1)
- undefine(`FUNC_ALIGN')')
- 
- define(`EPILOGUE',
--`ifelse(WORDS_BIGENDIAN,no,
--`.size C_NAME($1), . - C_NAME($1)',
--`.size .C_NAME($1), . - .C_NAME($1)
--.size C_NAME($1), . - .C_NAME($1)')')
-+`.size C_NAME($1), . - C_NAME($1)')
- 
- C Get vector-scalar register from vector register
- C VSR(VR)
diff --git a/security/nettle/files/patch-powerpc64-p8-aes-decrypt-internal.asm b/security/nettle/files/patch-powerpc64-p8-aes-decrypt-internal.asm
index 741be5db338e..6ec80f833cc9 100644
--- a/security/nettle/files/patch-powerpc64-p8-aes-decrypt-internal.asm
+++ b/security/nettle/files/patch-powerpc64-p8-aes-decrypt-internal.asm
@@ -1,19 +1,19 @@
---- powerpc64/p8/aes-decrypt-internal.asm.orig	2021-06-06 20:06:30 UTC
+--- powerpc64/p8/aes-decrypt-internal.asm.orig	2022-06-02 17:57:16 UTC
 +++ powerpc64/p8/aes-decrypt-internal.asm
 @@ -71,7 +71,7 @@ define(`FUNC_ALIGN', `5')
  PROLOGUE(_nettle_aes_decrypt)
   vxor ZERO,ZERO,ZERO
  
-- DATA_LOAD_VEC(swap_mask,.swap_mask,r5)
-+ DATA_LOAD_VEC(swap_mask,.swap_data,r5)
+- DATA_LOAD_VEC(SWAP_MASK,.swap_mask,r5)
++ DATA_LOAD_VEC(SWAP_MASK,.swap_data,r5)
  
   subi ROUNDS,ROUNDS,1
   srdi LENGTH,LENGTH,4
 @@ -351,6 +351,6 @@ EPILOGUE(_nettle_aes_decrypt)
  
   .data
   .align 4
 -.swap_mask:
 +.swap_data:
  IF_LE(`.byte 8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7')
  IF_BE(`.byte 3,2,1,0,7,6,5,4,11,10,9,8,15,14,13,12')
diff --git a/security/nettle/files/patch-powerpc64-p8-aes-encrypt-internal.asm b/security/nettle/files/patch-powerpc64-p8-aes-encrypt-internal.asm
index fddeedabb748..313ba61a4f6b 100644
--- a/security/nettle/files/patch-powerpc64-p8-aes-encrypt-internal.asm
+++ b/security/nettle/files/patch-powerpc64-p8-aes-encrypt-internal.asm
@@ -1,19 +1,19 @@
---- powerpc64/p8/aes-encrypt-internal.asm.orig	2021-06-06 20:06:30 UTC
+--- powerpc64/p8/aes-encrypt-internal.asm.orig	2022-06-02 17:57:16 UTC
 +++ powerpc64/p8/aes-encrypt-internal.asm
 @@ -63,7 +63,7 @@ define(`S7', `v9')
  
  define(`FUNC_ALIGN', `5')
  PROLOGUE(_nettle_aes_encrypt)
-- DATA_LOAD_VEC(swap_mask,.swap_mask,r5)
-+ DATA_LOAD_VEC(swap_mask,.swap_data,r5)
+- DATA_LOAD_VEC(SWAP_MASK,.swap_mask,r5)
++ DATA_LOAD_VEC(SWAP_MASK,.swap_data,r5)
  
   subi ROUNDS,ROUNDS,1
   srdi LENGTH,LENGTH,4
 @@ -328,6 +328,6 @@ EPILOGUE(_nettle_aes_encrypt)
  
   .data
   .align 4
 -.swap_mask:
 +.swap_data:
  IF_LE(`.byte 8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7')
  IF_BE(`.byte 3,2,1,0,7,6,5,4,11,10,9,8,15,14,13,12')
diff --git a/security/nettle/pkg-plist b/security/nettle/pkg-plist
index 7073dc2ac1ae..100c1300d537 100644
--- a/security/nettle/pkg-plist
+++ b/security/nettle/pkg-plist
@@ -1,118 +1,120 @@
 bin/nettle-hash
 bin/nettle-lfib-stream
 bin/nettle-pbkdf2
 bin/pkcs1-conv
 bin/sexp-conv
 include/nettle/aes.h
 include/nettle/arcfour.h
 include/nettle/arctwo.h
 include/nettle/asn1.h
 include/nettle/base16.h
 include/nettle/base64.h
 include/nettle/bignum.h
 include/nettle/blowfish.h
 include/nettle/buffer.h
 include/nettle/camellia.h
 include/nettle/cast128.h
 include/nettle/cbc.h
 include/nettle/ccm.h
 include/nettle/cfb.h
 include/nettle/chacha-poly1305.h
 include/nettle/chacha.h
 include/nettle/cmac.h
 include/nettle/ctr.h
 include/nettle/curve25519.h
 include/nettle/curve448.h
 include/nettle/des.h
 include/nettle/dsa-compat.h
 include/nettle/dsa.h
 include/nettle/eax.h
 include/nettle/ecc-curve.h
 include/nettle/ecc.h
 include/nettle/ecdsa.h
 include/nettle/eddsa.h
 include/nettle/gcm.h
 include/nettle/gostdsa.h
 include/nettle/gosthash94.h
 include/nettle/hkdf.h
 include/nettle/hmac.h
 include/nettle/knuth-lfib.h
 include/nettle/macros.h
 include/nettle/md2.h
 include/nettle/md4.h
 include/nettle/md5-compat.h
 include/nettle/md5.h
 include/nettle/memops.h
 include/nettle/memxor.h
 include/nettle/nettle-meta.h
 include/nettle/nettle-types.h
+include/nettle/nist-keywrap.h
 include/nettle/pbkdf2.h
 include/nettle/pgp.h
 include/nettle/pkcs1.h
 include/nettle/poly1305.h
 include/nettle/pss-mgf1.h
 include/nettle/pss.h
 include/nettle/realloc.h
 include/nettle/ripemd160.h
 include/nettle/rsa.h
 include/nettle/salsa20.h
 include/nettle/serpent.h
 include/nettle/sexp.h
 include/nettle/sha.h
 include/nettle/sha1.h
 include/nettle/sha2.h
 include/nettle/sha3.h
 include/nettle/siv-cmac.h
+include/nettle/sm3.h
 include/nettle/streebog.h
 include/nettle/twofish.h
 include/nettle/umac.h
 include/nettle/version.h
 include/nettle/xts.h
 include/nettle/yarrow.h
 lib/libhogweed.a
 lib/libhogweed.so
 lib/libhogweed.so.6
-lib/libhogweed.so.6.4
+lib/libhogweed.so.6.5
 lib/libnettle.a
 lib/libnettle.so
 lib/libnettle.so.8
-lib/libnettle.so.8.4
+lib/libnettle.so.8.5
 libdata/pkgconfig/hogweed.pc
 libdata/pkgconfig/nettle.pc
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/nettle.html
 %%PORTDOCS%%%%DOCSDIR%%/nettle.pdf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/base16dec
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/base16dec.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/base16enc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/base16enc.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/base64dec
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/base64dec.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/base64enc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/base64enc.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecc-benchmark
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecc-benchmark.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hogweed-benchmark
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hogweed-benchmark.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/io.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/io.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nettle-benchmark
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nettle-benchmark.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nettle-openssl.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/random-prime
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/random-prime.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/read_rsa_key.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-decrypt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-decrypt.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-encrypt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-encrypt.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-keygen
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-keygen.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-session.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-sign
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-sign.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-verify
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-verify.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/timing.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/timing.h