diff --git a/security/tpm2-tss/Makefile b/security/tpm2-tss/Makefile
index 1900b5219753..43a4d70323da 100644
--- a/security/tpm2-tss/Makefile
+++ b/security/tpm2-tss/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	tpm2-tss
-DISTVERSION=	3.2.0
-PORTREVISION=	1
+DISTVERSION=	4.0.1
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/tpm2-software/tpm2-tss/releases/download/${DISTVERSION}/
 
 MAINTAINER=	tstruk@gmail.com
 COMMENT=	TPM2 Software Stack core library
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
-		libcurl.so:ftp/curl
+		libcurl.so:ftp/curl \
+		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		compiler:c11 gmake libtool pkgconfig ssl
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \
 		EXTRA_CFLAGS="-I${LOCALBASE}/include"
 
 KEYDIR=		/var/lib/tpm2-tss/system/keystore
 RUNDIR=		/var/run/tpm2-tss/eventlog
 CONFIGURE_ARGS=	--disable-doxygen-doc --disable-dependency-tracking --enable-valgrind=no \
 		--with-runstatedir=${RUNDIR}
 
 INSTALL_TARGET=	install-strip
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/lib/udev/rules.d/tpm-udev.rules
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/udev/rules.d
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/udev
 	@${MKDIR} ${STAGEDIR}${RUNDIR}
 	@${MKDIR} ${STAGEDIR}${KEYDIR}
 
 .include <bsd.port.mk>
diff --git a/security/tpm2-tss/distinfo b/security/tpm2-tss/distinfo
index c4333fbcf6de..4976a4cf6e91 100644
--- a/security/tpm2-tss/distinfo
+++ b/security/tpm2-tss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646512509
-SHA256 (tpm2-tss-3.2.0.tar.gz) = 48305e4144dcf6d10f3b25b7bccf0189fd2d1186feafd8cd68c6b17ecf0d7912
-SIZE (tpm2-tss-3.2.0.tar.gz) = 1629211
+TIMESTAMP = 1694301508
+SHA256 (tpm2-tss-4.0.1.tar.gz) = 532a70133910b6bd842289915b3f9423c0205c0ea009d65294ca18a74087c950
+SIZE (tpm2-tss-4.0.1.tar.gz) = 1787139
diff --git a/security/tpm2-tss/pkg-plist b/security/tpm2-tss/pkg-plist
index e1eeb369db01..121ae104f2b2 100644
--- a/security/tpm2-tss/pkg-plist
+++ b/security/tpm2-tss/pkg-plist
@@ -1,94 +1,106 @@
 @dir /var/lib/tpm2-tss/system/keystore
 @dir /var/lib/tpm2-tss/system
 @dir /var/lib/tpm2-tss
 @dir /var/lib
 @dir /var/run/tpm2-tss/eventlog
 @dir /var/run/tpm2-tss
 etc/sysusers.d/tpm2-tss.conf
 etc/tmpfiles.d/tpm2-tss-fapi.conf
 %%ETCDIR%%/fapi-config.json
 %%ETCDIR%%/fapi-profiles/P_ECCP256SHA256.json
 %%ETCDIR%%/fapi-profiles/P_RSA2048SHA256.json
 include/tss2/tss2_common.h
 include/tss2/tss2_esys.h
 include/tss2/tss2_fapi.h
 include/tss2/tss2_mu.h
+include/tss2/tss2_policy.h
 include/tss2/tss2_rc.h
 include/tss2/tss2_sys.h
 include/tss2/tss2_tcti.h
 include/tss2/tss2_tcti_cmd.h
 include/tss2/tss2_tcti_device.h
 include/tss2/tss2_tcti_mssim.h
 include/tss2/tss2_tcti_pcap.h
+include/tss2/tss2_tcti_spi_helper.h
 include/tss2/tss2_tcti_swtpm.h
 include/tss2/tss2_tctildr.h
 include/tss2/tss2_tpm2_types.h
 lib/libtss2-esys.a
 lib/libtss2-esys.so
 lib/libtss2-esys.so.0
-lib/libtss2-esys.so.0.0.0
+lib/libtss2-esys.so.0.0.1
 lib/libtss2-fapi.a
 lib/libtss2-fapi.so
 lib/libtss2-fapi.so.1
 lib/libtss2-fapi.so.1.0.0
 lib/libtss2-mu.a
 lib/libtss2-mu.so
 lib/libtss2-mu.so.0
-lib/libtss2-mu.so.0.0.0
+lib/libtss2-mu.so.0.0.1
+lib/libtss2-policy.a
+lib/libtss2-policy.so
+lib/libtss2-policy.so.0
+lib/libtss2-policy.so.0.0.0
 lib/libtss2-rc.a
 lib/libtss2-rc.so
 lib/libtss2-rc.so.0
 lib/libtss2-rc.so.0.0.0
+lib/libtss2-tcti-spi-helper.a
+lib/libtss2-tcti-spi-helper.so
+lib/libtss2-tcti-spi-helper.so.0
+lib/libtss2-tcti-spi-helper.so.0.0.0
 lib/libtss2-sys.a
 lib/libtss2-sys.so
 lib/libtss2-sys.so.1
-lib/libtss2-sys.so.1.0.0
+lib/libtss2-sys.so.1.0.1
 lib/libtss2-tcti-cmd.a
 lib/libtss2-tcti-cmd.so
 lib/libtss2-tcti-cmd.so.0
 lib/libtss2-tcti-cmd.so.0.0.0
 lib/libtss2-tcti-device.a
 lib/libtss2-tcti-device.so
 lib/libtss2-tcti-device.so.0
 lib/libtss2-tcti-device.so.0.0.0
 lib/libtss2-tcti-mssim.a
 lib/libtss2-tcti-mssim.so
 lib/libtss2-tcti-mssim.so.0
 lib/libtss2-tcti-mssim.so.0.0.0
 lib/libtss2-tcti-pcap.a
 lib/libtss2-tcti-pcap.so
 lib/libtss2-tcti-pcap.so.0
 lib/libtss2-tcti-pcap.so.0.0.0
 lib/libtss2-tcti-swtpm.a
 lib/libtss2-tcti-swtpm.so
 lib/libtss2-tcti-swtpm.so.0
 lib/libtss2-tcti-swtpm.so.0.0.0
 lib/libtss2-tctildr.a
 lib/libtss2-tctildr.so
 lib/libtss2-tctildr.so.0
 lib/libtss2-tctildr.so.0.0.0
 libdata/pkgconfig/tss2-esys.pc
 libdata/pkgconfig/tss2-fapi.pc
 libdata/pkgconfig/tss2-mu.pc
+libdata/pkgconfig/tss2-policy.pc
 libdata/pkgconfig/tss2-rc.pc
 libdata/pkgconfig/tss2-sys.pc
 libdata/pkgconfig/tss2-tcti-cmd.pc
 libdata/pkgconfig/tss2-tcti-device.pc
 libdata/pkgconfig/tss2-tcti-mssim.pc
 libdata/pkgconfig/tss2-tcti-pcap.pc
+libdata/pkgconfig/tss2-tcti-spi-helper.pc
 libdata/pkgconfig/tss2-tcti-swtpm.pc
 libdata/pkgconfig/tss2-tctildr.pc
 man/man3/Tss2_TctiLdr_Finalize.3.gz
 man/man3/Tss2_TctiLdr_FreeInfo.3.gz
 man/man3/Tss2_TctiLdr_GetInfo.3.gz
 man/man3/Tss2_TctiLdr_Initialize.3.gz
 man/man3/Tss2_Tcti_Cmd_Init.3.gz
 man/man3/Tss2_Tcti_Device_Init.3.gz
 man/man3/Tss2_Tcti_Mssim_Init.3.gz
 man/man5/fapi-config.5.gz
 man/man5/fapi-profile.5.gz
 man/man7/tss2-tcti-cmd.7.gz
 man/man7/tss2-tcti-device.7.gz
 man/man7/tss2-tcti-mssim.7.gz
 man/man7/tss2-tcti-swtpm.7.gz
 man/man7/tss2-tctildr.7.gz