diff --git a/security/tpm2-abrmd/Makefile b/security/tpm2-abrmd/Makefile
index f74fd0c9507e..8dc04e65c8ab 100644
--- a/security/tpm2-abrmd/Makefile
+++ b/security/tpm2-abrmd/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	tpm2-abrmd
 DISTVERSION=	3.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 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/tpm2-abrmd-devd.conf b/security/tpm2-abrmd/files/tpm2-abrmd-devd.conf
index 27f804d89fb9..f7f4091a25a5 100644
--- a/security/tpm2-abrmd/files/tpm2-abrmd-devd.conf
+++ b/security/tpm2-abrmd/files/tpm2-abrmd-devd.conf
@@ -1,6 +1,9 @@
 # Allow members of _tss group to access tpm device
 
 notify 100 {
-	device-name	"tpm0";
-	action		"chgrp _tss /dev/$cdev; chmod g+rw /dev/$cdev";
+	match "system"		"DEVFS";
+	match "subsystem"	"CDEV";
+	match "type"		"CREATE";
+	match "cdev"		"tpm[0-9]+";
+	action				"chgrp _tss /dev/tpm0; chmod g+rw /dev/tpm0";
 };