diff --git a/devel/libccid/Makefile b/devel/libccid/Makefile
--- a/devel/libccid/Makefile
+++ b/devel/libccid/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	ccid
-PORTVERSION=	1.5.5
-PORTREVISION=	1
+PORTVERSION=	1.6.0
 CATEGORIES=	devel
 MASTER_SITES=	https://ccid.apdu.fr/files/
 
@@ -13,27 +12,37 @@
 
 LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
-USES=		perl5 pkgconfig tar:bzip2
+USES=		perl5 pkgconfig tar:xz meson
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-usbdropdir=${PREFIX}/lib/pcsc/drivers \
-		--enable-ccidtwindir=${PREFIX}/lib/pcsc/drivers/serial
+LDFLAGS+=	-pthread
+USBDROPDIR?=	"`pkgconf --variable usbdropdir libpcsclite \
+			| ${SED} 's,drivers/,drivers,'`"
+BUNDLE_DIR=	${USBDROPDIR}/ifd-ccid.bundle
 
-LDFLAGS=	-pthread
 INSTALL_TARGET=	install-strip
 
+PLIST_DIRS=	${BUNDLE_DIR}/Contents/FreeBSD \
+		${BUNDLE_DIR}/Contents \
+		${BUNDLE_DIR} \
+		${USBDROPDIR}
+
 PLIST_FILES=	bin/RSA_SecurID_getpasswd \
-		lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so \
-		lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist \
-		share/man/man1/RSA_SecurID_getpasswd.1.gz
+		bin/Kobil_mIDentity_switch \
+		${BUNDLE_DIR}/Contents/FreeBSD/libccid.so \
+		${BUNDLE_DIR}/Contents/Info.plist \
+		share/man/man1/RSA_SecurID_getpasswd.1.gz \
+		share/man/man8/Kobil_mIDentity_switch.8.gz
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/contrib/RSA_SecurID/RSA_SecurID_getpasswd \
+	${INSTALL_PROGRAM} ${WRKSRC}/${MESON_BUILD_DIR}/Kobil_mIDentity_switch \
+		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8 \
+		${STAGEDIR}${PREFIX}/share/man/man8
+	${INSTALL_PROGRAM} ${WRKSRC}/${MESON_BUILD_DIR}/RSA_SecurID_getpasswd \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/contrib/RSA_SecurID/RSA_SecurID_getpasswd.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so
 
 .include <bsd.port.mk>
diff --git a/devel/libccid/distinfo b/devel/libccid/distinfo
--- a/devel/libccid/distinfo
+++ b/devel/libccid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709534464
-SHA256 (ccid-1.5.5.tar.bz2) = 194708f75fe369d45dd7c15e8b3e8a7db8b49cfc5557574ca2a2e76ef12ca0ca
-SIZE (ccid-1.5.5.tar.bz2) = 708374
+TIMESTAMP = 1717336680
+SHA256 (ccid-1.6.0.tar.xz) = cdca7c22c45169cfc300d65d5362b7644ee195289f4fb8bf475a6cd321752c2c
+SIZE (ccid-1.6.0.tar.xz) = 195708