diff --git a/security/tpm2-abrmd/Makefile b/security/tpm2-abrmd/Makefile
index 81da6fe1a3e7..f74fd0c9507e 100644
--- a/security/tpm2-abrmd/Makefile
+++ b/security/tpm2-abrmd/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	tpm2-abrmd
 DISTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/tpm2-software/tpm2-abrmd/releases/download/${DISTVERSION}/
 
 MAINTAINER=	tstruk@gmail.com
 COMMENT=	TPM2 Access Broker & Resource Manager Deamon
 WWW=		https://github.com/tpm2-software/tpm2-abrmd
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libtss2-esys.so:security/tpm2-tss \
 		libgio-2.0.so:devel/glib20
 RUN_DEPENDS=	dbus-daemon:devel/dbus
 
 USES=		gmake libtool pkgconfig gnome
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20
 USE_RC_SUBR=	tpm2-abrmd
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-dbuspolicydir=${PREFIX}/etc/dbus-1/system.d
 
 GROUPS=		_tss
 USERS=		_tss
 
 SUB_LIST=	DBUS_DAEMON=dbus
 
 pre-install:
 	@${INSTALL_DATA} ${FILESDIR}/tpm2-abrmd-devd.conf ${STAGEDIR}${PREFIX}/etc/devd
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/lib/systemd/system-preset/tpm2-abrmd.preset
 	@${RM} ${STAGEDIR}${PREFIX}/lib/systemd/system/tpm2-abrmd.service
 	@${RM} ${STAGEDIR}${PREFIX}/share/dbus-1/system-services/com.intel.tss2.Tabrmd.service
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/systemd/system
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/systemd/system-preset
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/systemd
 	@${RMDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/system-services
 	@${RMDIR} ${STAGEDIR}${PREFIX}/share/dbus-1
 
 .include <bsd.port.mk>
diff --git a/security/tpm2-abrmd/files/patch-dist_tpm2-abrmd.conf b/security/tpm2-abrmd/files/patch-dist_tpm2-abrmd.conf
index 10d8e55d7a19..755942458792 100644
--- a/security/tpm2-abrmd/files/patch-dist_tpm2-abrmd.conf
+++ b/security/tpm2-abrmd/files/patch-dist_tpm2-abrmd.conf
@@ -1,11 +1,25 @@
---- dist/tpm2-abrmd.conf.orig	2019-08-27 23:12:36 UTC
+--- dist/tpm2-abrmd.conf.orig	2022-05-09 15:39:53 UTC
 +++ dist/tpm2-abrmd.conf
 @@ -2,7 +2,7 @@
   "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
  <busconfig>
    <!-- ../system.conf have denied everything, so we just punch some holes -->
 -  <policy user="tss">
 +  <policy user="_tss">
      <allow own="com.intel.tss2.Tabrmd"/>
    </policy>
    <policy user="root">
+@@ -17,11 +17,11 @@
+     <allow send_destination="com.intel.tss2.Tabrmd"/>
+     <allow receive_sender="com.intel.tss2.Tabrmd"/>
+   </policy>
+-  <policy user="tss">
++  <policy user="_tss">
+     <allow send_destination="com.intel.tss2.Tabrmd"/>
+     <allow receive_sender="com.intel.tss2.Tabrmd"/>
+   </policy>
+-  <policy group="tss">
++  <policy group="_tss">
+     <allow send_destination="com.intel.tss2.Tabrmd"/>
+     <allow receive_sender="com.intel.tss2.Tabrmd"/>
+   </policy>