diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile
index 3387f82d9ed0..f0772ccb6047 100644
--- a/comms/trustedqsl/Makefile
+++ b/comms/trustedqsl/Makefile
@@ -1,55 +1,54 @@
 PORTNAME=	trustedqsl
-DISTVERSION=	2.8.1
-PORTREVISION=	1
+DISTVERSION=	2.8.4
 CATEGORIES=	comms hamradio
-MASTER_SITES=	http://www.arrl.org/files/file/LoTW%20Instructions/ \
-		LOCAL/shurd
+MASTER_SITES=	https://www.arrl.org/files/file/LoTW%20Instructions/
 DISTNAME=	tqsl-${DISTVERSION}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio Station electronic trusted logbook
-WWW=		https://lotw.arrl.org/lotw-help/
+WWW=		https://lotw.arrl.org/lotw-help/ \
+		https://sourceforge.net/projects/trustedqsl/
 
 LICENSE=	ARRL
 LICENSE_NAME=	American Radio Relay League, Inc. All rights reserved.
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2
 
-USES=		cmake compiler:c++11-lib pkgconfig ssl sqlite
-USE_WX=		3.2
+USES=		cmake compiler:c++11-lib gettext pkgconfig ssl sqlite
 USE_LDCONFIG=	yes
-
-PKGMESSAGE=	${WRKDIR}/pkg-message
+USE_WX=		3.2
 
 CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
 
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 OPTIONS_DEFINE=		GEN_CRQ LOAD_CERT STATION_LOC CONVERTER
 OPTIONS_SUB=		yes
 
+CONVERTER_DESC=		Build converter
 GEN_CRQ_DESC=		Build gen_crq
 LOAD_CERT_DESC=		Build load_cert
 STATION_LOC_DESC=	Build station_loc
-CONVERTER_DESC=		Build converter
 
-GEN_CRQ_CMAKE_ON=	-DBUILD_GENCRQ=ON
-LOAD_CERT_CMAKE_ON=	-DBUILD_LOADCERT=ON
-STATION_LOC_CMAKE_ON=	-DBUILD_STATIONLOC=ON
-CONVERTER_CMAKE_ON=	-DBUILD_CONVERTER=ON
+CONVERTER_CMAKE_BOOL=	BUILD_CONVERTER
+GEN_CRQ_CMAKE_BOOL=	BUILD_GENCRQ
+LOAD_CERT_CMAKE_BOOL=	BUILD_LOADCERT
+STATION_LOC_CMAKE_BOOL=	BUILD_STATIONLOC
+
+post-patch:
+	@${SED} -e 's:%%PREFIX%%:${PREFIX}:g' \
+		${FILESDIR}/pkg-message > ${WRKDIR}/pkg-message
 
+post-install-CONVERTER-on:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/converter ${STAGEDIR}${PREFIX}/bin
 post-install-GEN_CRQ-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/gen_crq ${STAGEDIR}${PREFIX}/bin
 post-install-LOAD_CERT-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/load_cert ${STAGEDIR}${PREFIX}/bin
 post-install-STATION_LOC-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/station_loc ${STAGEDIR}${PREFIX}/bin
-post-install-CONVERTER-on:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/converter ${STAGEDIR}${PREFIX}/bin
-
-post-patch:
-	@${SED} -e 's:%%PREFIX%%:${PREFIX}:g' \
-		${FILESDIR}/pkg-message > ${WRKDIR}/pkg-message
 
 .include <bsd.port.mk>
diff --git a/comms/trustedqsl/distinfo b/comms/trustedqsl/distinfo
index 56b663a5c68e..280431389927 100644
--- a/comms/trustedqsl/distinfo
+++ b/comms/trustedqsl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747387423
-SHA256 (tqsl-2.8.1.tar.gz) = fed1ccb7b4cdf22ece32aa6e9b58c2245af1ad0b77483e3466b693af2c57e7a6
-SIZE (tqsl-2.8.1.tar.gz) = 4125568
+TIMESTAMP = 1771905132
+SHA256 (tqsl-2.8.4.tar.gz) = 6e71972ab1f6734360ff9d116f3838cf733a0ff12e2749a46084e1a14f7840fc
+SIZE (tqsl-2.8.4.tar.gz) = 4213586