diff --git a/security/beid/Makefile b/security/beid/Makefile
index 0407f60e91e4..439acdc162ec 100644
--- a/security/beid/Makefile
+++ b/security/beid/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	beid
 DISTVERSIONPREFIX=	v
-DISTVERSION=	5.1.15
+DISTVERSION=	5.1.18
 CATEGORIES=	security
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Belgian eID middleware
 WWW=		https://github.com/Fedict/eid-mw/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_cxx_compile_stdcxx_11.m4:devel/autoconf-archive
 LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libcurl.so:ftp/curl \
 		libpcsclite.so:devel/pcsc-lite \
 		libproxy.so:net/libproxy
 RUN_DEPENDS=	pinentry:security/pinentry
 
+USES=		autoreconf gettext-tools gmake gnome libtool pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	Fedict
 GH_PROJECT=	eid-mw
-
-USES=		autoreconf compiler:c++11-lang gettext-tools gmake gnome \
-		libtool pkgconfig ssl
 USE_GNOME=	gtk30 libxml2
 GLIB_SCHEMAS=	eid-viewer.gschema.xml
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-p11kit --disable-static --with-gtkvers=3 \
+CONFIGURE_ARGS=	--disable-p11kit \
+		--disable-static \
 		--enable-webextension \
+		--with-gtkvers=3 \
 		--with-mozext=${PREFIX}/lib/firefox/distribution/extensions \
 		SSL_CFLAGS="-I${OPENSSLINC}" \
 		SSL_LIBS="-L${OPENSSLLIB} -lcrypto" \
 		SSL_PREFIX="${OPENSSLBASE}"
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${ECHO_CMD} ${DISTVERSION}-${GH_TAGNAME} > ${WRKSRC}/.version
 	@${REINPLACE_CMD} -e 's,/usr/bin/pinentry,${LOCALBASE}/bin/pinentry,' \
 		-e 's,/proc/%d/exe,/proc/%d/file,' \
 		${WRKSRC}/cardcomm/pkcs11/src/dialogs/dialogspinentry/dlgs_pinentry.cpp
 	@${REINPLACE_CMD} -e 's,/bin/bash,/bin/sh,' \
 		-e '/^LIBS=/s,=.*,=${PREFIX}/lib,' \
 		${WRKSRC}/plugins_tools/chrome_pkcs11/beid-update-nssdb
 	@${REINPLACE_CMD} '/^Exec=/s,/usr/bin,${PREFIX}/bin,' \
 		${WRKSRC}/plugins_tools/chrome_pkcs11/beid-update-nssdb.desktop
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/pkcs11
 	${LN} -s ../libbeidpkcs11.so.0 \
 		${STAGEDIR}${PREFIX}/lib/pkcs11/beidpkcs11.so
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/p11-kit/modules
 	${INSTALL_DATA} ${WRKSRC}/cardcomm/pkcs11/src/beid.module \
 		${STAGEDIR}${PREFIX}/share/p11-kit/modules
 	${RMDIR} ${STAGEDIR}${PREFIX}/share/locale/en@boldquot/LC_MESSAGES
 	${RMDIR} ${STAGEDIR}${PREFIX}/share/locale/en@boldquot
 	${RMDIR} ${STAGEDIR}${PREFIX}/share/locale/en@quot/LC_MESSAGES
 	${RMDIR} ${STAGEDIR}${PREFIX}/share/locale/en@quot
 
 .include <bsd.port.mk>
diff --git a/security/beid/distinfo b/security/beid/distinfo
index 7e8c48223802..eaedb7374af7 100644
--- a/security/beid/distinfo
+++ b/security/beid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711202144
-SHA256 (Fedict-eid-mw-v5.1.15_GH0.tar.gz) = af844c71edf4ebd99651137357d30fd624bddfaf1d16098002f6526fb311dd2d
-SIZE (Fedict-eid-mw-v5.1.15_GH0.tar.gz) = 16296281
+TIMESTAMP = 1715596816
+SHA256 (Fedict-eid-mw-v5.1.18_GH0.tar.gz) = b982078276ed5d03aca93ae797ea1e775e54e8caa044f5d5e5d437ab3f76c98f
+SIZE (Fedict-eid-mw-v5.1.18_GH0.tar.gz) = 16299966
diff --git a/security/beid/files/patch-plugins__tools_eid-viewer_Makefile.am b/security/beid/files/patch-plugins__tools_eid-viewer_Makefile.am
index 9338056c0800..7504fdd5d9b1 100644
--- a/security/beid/files/patch-plugins__tools_eid-viewer_Makefile.am
+++ b/security/beid/files/patch-plugins__tools_eid-viewer_Makefile.am
@@ -1,11 +1,15 @@
---- plugins_tools/eid-viewer/Makefile.am.orig	2021-08-13 09:34:02 UTC
+--- plugins_tools/eid-viewer/Makefile.am.orig	2024-05-02 11:49:11 UTC
 +++ plugins_tools/eid-viewer/Makefile.am
-@@ -131,7 +131,7 @@ eid_viewer_LDADD += $(top_builddir)/cardcomm/pkcs11/sr
+@@ -135,9 +135,10 @@ endif
+ if FUZZING
+ eid_viewer_LDADD += $(top_builddir)/cardcomm/pkcs11/src/libbeidpkcs11.la
  endif
++eid_viewer_LDFLAGS = -pthread
  libeidviewer_la_LIBADD = $(top_builddir)/plugins_tools/util/liblabels.la $(top_builddir)/cardcomm/pkcs11/src/libbeidpkcs11.la @SSL_LIBS@ @XML2_LIBS@
- libeidviewer_la_LDFLAGS = -version-info 1:0:1
+-libeidviewer_la_LDFLAGS = -version-info 1:0:1
 -AM_CFLAGS = @GTK_CFLAGS@ -I. -I$(srcdir)/include -Igtk -DDATAROOTDIR='"$(datarootdir)"' -I$(top_srcdir)/doc/sdk/include/v240 -I$(top_srcdir)/cardcomm/pkcs11/src/fuzz -I$(top_srcdir)/plugins_tools/util @SSL_CFLAGS@ @GIO_CFLAGS@ @XML2_CFLAGS@ @CURL_CFLAGS@ @libproxy_CFLAGS@ -fvisibility=hidden @FUZZING@
++libeidviewer_la_LDFLAGS = -pthread -version-info 1:0:1
 +AM_CPPFLAGS = -I. -I$(srcdir)/include -Igtk -DDATAROOTDIR='"$(datarootdir)"' -I$(top_srcdir)/doc/sdk/include/v240 -I$(top_srcdir)/cardcomm/pkcs11/src/fuzz -I$(top_srcdir)/plugins_tools/util @GTK_CFLAGS@ @SSL_CFLAGS@ @GIO_CFLAGS@ @XML2_CFLAGS@ @CURL_CFLAGS@ @libproxy_CFLAGS@ -fvisibility=hidden @FUZZING@
  AM_CXXFLAGS = $(AM_CFLAGS) -std=c++98
  SUBDIRS = . gtk/po test uml