diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 1563c6c89de7..f66e5d2f59c3 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2023/06/06 12:42:14 riastradh Exp $
+# $NetBSD: Makefile,v 1.40.2.1 2023/08/17 20:06:53 bsiegert Exp $
 
 DISTNAME=	opensc-0.23.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=OpenSC/}
 
@@ -20,7 +20,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-autostart-items
 CONFIGURE_ARGS+=	--disable-cmocka
 CONFIGURE_ARGS+=	--disable-strict  # avoid -Werror
-CONFIGURE_ARGS+=	--enable-notify
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 # The stylesheets are not found without this.
 CONFIGURE_ARGS+=	--with-xsl-stylesheetsdir=${PREFIX}/share/xsl/docbook
@@ -37,7 +36,6 @@ INSTALLATION_DIRS=	${EGDIR}
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/opensc.conf.example ${DESTDIR}${EGDIR}/opensc.conf
 
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 # build tools for doc; should be TOOLS
diff --git a/security/opensc/PLIST b/security/opensc/PLIST
index a7db554539f3..e13ec2f41fcb 100644
--- a/security/opensc/PLIST
+++ b/security/opensc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2023/02/21 17:23:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.14.4.1 2023/08/17 20:06:53 bsiegert Exp $
 bin/cardos-tool
 bin/cryptoflex-tool
 bin/dnie-tool
@@ -11,7 +11,7 @@ bin/netkey-tool
 bin/openpgp-tool
 bin/opensc-asn1
 bin/opensc-explorer
-bin/opensc-notify
+${NOTIFY}bin/opensc-notify
 bin/opensc-tool
 bin/piv-tool
 bin/pkcs11-register
diff --git a/security/opensc/options.mk b/security/opensc/options.mk
index e03f3c9ec4e4..d47c687ee86f 100644
--- a/security/opensc/options.mk
+++ b/security/opensc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2023/02/21 17:23:07 adam Exp $
+# $NetBSD: options.mk,v 1.6.4.1 2023/08/17 20:06:53 bsiegert Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.opensc
 
@@ -6,6 +6,11 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.opensc
 # that exactly one be chosen.
 PKG_OPTIONS_REQUIRED_GROUPS=	cardreader
 PKG_OPTIONS_GROUP.cardreader=	pcsc-lite openct
+
+# The notify option will cause programs not linked with libpthread
+# to abort when loading the opensc-pkcs11.so module. The most notable
+# example of such a program is ssh(1).
+PKG_SUPPORTED_OPTIONS=		notify
 PKG_SUGGESTED_OPTIONS=		pcsc-lite
 
 .include "../../mk/bsd.options.mk"
@@ -38,3 +43,12 @@ CONFIGURE_ARGS+=	--enable-openct
 .else
 CONFIGURE_ARGS+=	--disable-openct
 .endif
+
+.if !empty(PKG_OPTIONS:Mnotify)
+.include "../../devel/glib2/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-notify
+PLIST_SUBST+=		NOTIFY=""
+.else
+CONFIGURE_ARGS+=	--disable-notify
+PLIST_SUBST+=		NOTIFY="@comment "
+.endif