diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index cbee610fbbe0..8415f98927a4 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	mpop
-DISTVERSION=	1.4.21
+DISTVERSION=	1.4.22
 CATEGORIES=	mail
 MASTER_SITES=	https://marlam.de/mpop/releases/
 
 MAINTAINER=	mce@FreeBSD.org
 COMMENT=	Small and fast POP3 client
 WWW=		https://marlam.de/mpop/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cpe gmake makeinfo pkgconfig tar:xz
 CPE_VENDOR=	martin_lambers
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tls=no
 INFO=		mpop
 
 OPTIONS_DEFINE=		GSASL IDN LIBSECRET MPOPD NLS
 OPTIONS_DEFAULT=	GNUTLS IDN MPOPD
-OPTIONS_RADIO=		TLS
-OPTIONS_RADIO_TLS=	GNUTLS LIBTLS OPENSSL
+OPTIONS_SINGLE=		TLS
+OPTIONS_SINGLE_TLS=	GNUTLS LIBTLS OPENSSL
 OPTIONS_SUB=		yes
 
 GSASL_DESC=		${SASL_DESC} via GNU SASL
 LIBSECRET_DESC=		GNOME password management
 LIBTLS_DESC=		SSL/TLS support via libtls
 MPOPD_DESC=		Include minimal POP3 server
 
 GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=		--with-tls=gnutls
 GSASL_LIB_DEPENDS=		libgsasl.so:security/libgsasl
 GSASL_CONFIGURE_WITH=		libgsasl
 IDN_LIB_DEPENDS=		libidn2.so:dns/libidn2
 IDN_CONFIGURE_WITH=		libidn
 LIBSECRET_LIB_DEPENDS=		libsecret-1.so:security/libsecret
+LIBSECRET_USES=			gnome
+LIBSECRET_USE=			GNOME=glib20
 LIBSECRET_CONFIGURE_WITH=	libsecret
 LIBTLS_LIB_DEPENDS=		libtls.so:security/${"${SSL_DEFAULT:Mlibressl*}":?libressl:libretls}
 LIBTLS_CONFIGURE_ON=		--with-tls=libtls
 MPOPD_CONFIGURE_WITH=		mpopd
 NLS_USES=			gettext
 NLS_CONFIGURE_ENABLE=		nls
 OPENSSL_USES=			ssl
 OPENSSL_CONFIGURE_ON=		--with-tls=openssl
 OPENSSL_CONFIGURE_ENV=		${OPENSSLINC:M/usr/include:C,.+,libssl_CFLAGS=" ",} \
 				${OPENSSLLIB:M/usr/lib:C,.+,libssl_LIBS="-lssl -lcrypto",}
 
 post-patch:
 	@${REINPLACE_CMD} -E -e 's,/etc/ssl/certs,${LOCALBASE}/share/certs,' \
 		-e '/crt/s/ca(\\?)-certificates/ca\1-root\1-nss/' \
 		${WRKSRC}/doc/mpop.*
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/mpoprc.example ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/mpop/distinfo b/mail/mpop/distinfo
index 4af2a3e0e856..d68c8eee066f 100644
--- a/mail/mpop/distinfo
+++ b/mail/mpop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1736825014
-SHA256 (mpop-1.4.21.tar.xz) = 4ca0d1e0d01366fe3e0cf490d88d154df511278fb595638713be3ca675665855
-SIZE (mpop-1.4.21.tar.xz) = 405468
+TIMESTAMP = 1782559056
+SHA256 (mpop-1.4.22.tar.xz) = 2cd64a9c29a5ade3429230c70610ca4b6ea305fbc264f6961b5d85a7a8cecd4b
+SIZE (mpop-1.4.22.tar.xz) = 408348
diff --git a/mail/mpop/files/patch-src_base64.h b/mail/mpop/files/patch-src_base64.h
new file mode 100644
index 000000000000..b0f955d3c3eb
--- /dev/null
+++ b/mail/mpop/files/patch-src_base64.h
@@ -0,0 +1,10 @@
+--- src/base64.h.orig	2026-06-27 11:26:35 UTC
++++ src/base64.h
+@@ -19,6 +19,7 @@
+ #define BASE64_H
+ 
+ #include <stddef.h>
++#include <stdbool.h>
+ typedef size_t idx_t;
+ 
+ #ifdef __cplusplus