diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
index 4548d86756be..0ee5c14542df 100644
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@@ -1,64 +1,67 @@
 # Created by: Stephen Hurd <shurd@FreeBSD.org>
 
 PORTNAME=	cqrlog
-PORTVERSION=	2.5.0
+PORTVERSION=	2.5.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
 CATEGORIES=	comms hamradio
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio logging application
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libhamlib.so:comms/hamlib
 
 USES=		fpc gnome lazarus:flavors shebangfix ssl:run dos2unix \
 		mysql:server xorg
 
 USE_GNOME+=	cairo
 USE_XORG=	x11
 USE_GITHUB=	yes
 GH_ACCOUNT=	ok2cqr
 
 SHEBANG_FILES=	tools/cqrlog-apparmor-fix \
 		voice_keyer/voice_keyer.sh
 USE_FPC=	cairo fcl-base chm fcl-db fcl-image fcl-json fcl-net fcl-web \
 		fcl-registry rtl-extra fcl-xml mysql numlib opengl openssl \
 		pasjpeg regexpr x11
 
 ALL_TARGET=	${PORTNAME}
 
 MAKE_ENV+=	LAZBUILD_CMD="${LAZBUILD_CMD}" \
 		LAZBUILD_ARGS="${LAZBUILD_ARGS}" \
 		LCL_PLATFORM="${LCL_PLATFORM}" \
 		LAZARUS_DIR="${LAZARUS_DIR}"
 
 NO_LAZBUILD=	yes
 LAZBUILD_ARGS=	-d --pcp=.
 DOS2UNIX_WRKSRC=${WRKSRC}/src/synapse/
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 post-extract:
 	@${RM} -r ${WRKSRC}/src/lnet/lib/openssl.pas
 
 post-patch:
 	@${SED} -e s!%%LOCALBASE%%!${LOCALBASE}!g \
 		-e s!%%MAKE_CMD%%!${MAKE_CMD}!g \
 		-e s!%%LAZARUSDIR%%!${LAZARUS_DIR}!g \
 		${FILESDIR}/environmentoptions.xml.in \
 		> ${WRKSRC}/environmentoptions.xml
 	${REINPLACE_CMD} -e s!%%LOCALBASE%%!${LOCALBASE}!g \
 		${WRKSRC}/help/cwd.html ${WRKSRC}/help/h1.html \
 		${WRKSRC}/src/cqrlog.lpi ${WRKSRC}/src/dData.pas \
 		${WRKSRC}/src/dUtils.pas \
 		${WRKSRC}/src/fLoTWExport.pas ${WRKSRC}/src/fLoTWExport.lfm \
 		${WRKSRC}/src/fPreferences.pas ${WRKSRC}/src/fRotControl.pas \
 		${WRKSRC}/src/fTRXControl.pas ${WRKSRC}/src/fPreferences.lfm
 	${REINPLACE_CMD} -e s!%%DATADIR%%!${DATADIR}!g \
 		${WRKSRC}/src/dData.pas ${WRKSRC}/src/fGrayline.pas
 
+post-build:
+	@${RM} ${WRKSRC}/help/cwd.html.*
+	@${RM} ${WRKSRC}/help/h1.html.*
+
 .include <bsd.port.mk>
diff --git a/comms/cqrlog/distinfo b/comms/cqrlog/distinfo
index 2d953d0d6d02..7d47f92a11c9 100644
--- a/comms/cqrlog/distinfo
+++ b/comms/cqrlog/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1643038951
-SHA256 (ok2cqr-cqrlog-v2.5.0_GH0.tar.gz) = f5498735dd83214e4b9b5aa83f1bc05da3842c904a446293d19ae76cad3e52e4
-SIZE (ok2cqr-cqrlog-v2.5.0_GH0.tar.gz) = 14452404
+TIMESTAMP = 1657685479
+SHA256 (ok2cqr-cqrlog-v2.5.2_GH0.tar.gz) = 82837455dc9f44f43dc7658d330c71cf09c38d794addacab1da936fdcdbefdca
+SIZE (ok2cqr-cqrlog-v2.5.2_GH0.tar.gz) = 14469864
diff --git a/comms/cqrlog/files/patch-src_fNewQSO.lfm b/comms/cqrlog/files/patch-src_fNewQSO.lfm
index cdbadec0b812..ff84fce292f6 100644
--- a/comms/cqrlog/files/patch-src_fNewQSO.lfm
+++ b/comms/cqrlog/files/patch-src_fNewQSO.lfm
@@ -1,11 +1,11 @@
---- src/fNewQSO.lfm.orig	2022-01-25 16:11:35 UTC
-+++ src/fNewQSO.lfm
-@@ -8,7 +8,7 @@ object frmNewQSO: TfrmNewQSO
-   HorzScrollBar.Page = 997
-   VertScrollBar.Page = 623
+--- src/fNewQSO.lfm	2021-02-12 11:24:42.000000000 -0500
++++ src/fNewQSO.lfm	2022-07-12 23:12:45.643902000 -0500
+@@ -8,7 +8,7 @@
+   HorzScrollBar.Page = 974
+   VertScrollBar.Page = 638
    AutoScroll = True
 -  Caption = 'New QSO ... (CQRLOG for Linux)'
 +  Caption = 'New QSO ... (CQRLOG for FreeBSD)'
-   ClientHeight = 673
-   ClientWidth = 997
+   ClientHeight = 684
+   ClientWidth = 1032
    Icon.Data = {