diff --git a/security/tpm2-tss/Makefile b/security/tpm2-tss/Makefile
--- a/security/tpm2-tss/Makefile
+++ b/security/tpm2-tss/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tpm2-tss
-DISTVERSION=	2.4.5
+DISTVERSION=	3.1.0
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/tpm2-software/tpm2-tss/releases/download/${DISTVERSION}/
 
@@ -17,7 +17,11 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBCRYPTO_CFLAGS="-I${OPENSSLINC}" LIBCRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \
 		EXTRA_CFLAGS="-I${LOCALBASE}/include"
-CONFIGURE_ARGS=	--disable-doxygen-doc --disable-dependency-tracking --enable-valgrind=no
+
+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
 
@@ -25,5 +29,7 @@
 	@${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
--- a/security/tpm2-tss/distinfo
+++ b/security/tpm2-tss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614826611
-SHA256 (tpm2-tss-2.4.5.tar.gz) = a1e2dbf2ac2f5f77f6ef217ea36d1c69b33a61fe03c46946bfbfa4f7d17bd980
-SIZE (tpm2-tss-2.4.5.tar.gz) = 1439394
+TIMESTAMP = 1621301767
+SHA256 (tpm2-tss-3.1.0.tar.gz) = 8900a6603f74310b749b65f23c3461cde6e2a23a5f61058b21004c25f9cf19e8
+SIZE (tpm2-tss-3.1.0.tar.gz) = 1584690
diff --git a/security/tpm2-tss/pkg-plist b/security/tpm2-tss/pkg-plist
--- a/security/tpm2-tss/pkg-plist
+++ b/security/tpm2-tss/pkg-plist
@@ -1,3 +1,9 @@
+@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
@@ -10,8 +16,11 @@
 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_swtpm.h
 include/tss2/tss2_tctildr.h
 include/tss2/tss2_tpm2_types.h
 lib/libtss2-esys.a
@@ -20,8 +29,8 @@
 lib/libtss2-esys.so.0.0.0
 lib/libtss2-fapi.a
 lib/libtss2-fapi.so
-lib/libtss2-fapi.so.0
-lib/libtss2-fapi.so.0.0.0
+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
@@ -32,8 +41,12 @@
 lib/libtss2-rc.so.0.0.0
 lib/libtss2-sys.a
 lib/libtss2-sys.so
-lib/libtss2-sys.so.0
-lib/libtss2-sys.so.0.0.0
+lib/libtss2-sys.so.1
+lib/libtss2-sys.so.1.0.0
+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
@@ -42,6 +55,14 @@
 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
@@ -51,18 +72,23 @@
 libdata/pkgconfig/tss2-mu.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-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_TctiLdr_Initialize_Ex.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