diff --git a/comms/klog/Makefile b/comms/klog/Makefile
index c9881fd5a0ef..50deaea205e8 100644
--- a/comms/klog/Makefile
+++ b/comms/klog/Makefile
@@ -1,53 +1,52 @@
 PORTNAME=	klog
-PORTVERSION=	0.9.8.1
-PORTREVISION=	1
+PORTVERSION=	1.8.5
+#PORTREVISION=	1
 CATEGORIES=	comms hamradio
-MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Simple Qt-based amateur radio logger
 
 LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
+#LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libhamlib.so:comms/hamlib
 
 USES=		compiler:c++11-lang gl qmake qt:5 xorg
+USE_GITHUB=	yes
 USE_GL=		gl
 USE_QT=		buildtools_build charts core gui linguisttools_build multimedia network \
 		printsupport sql sql-sqlite3_run serialport widgets
+GH_ACCOUNT=	ea4k
+GH_PROJECT=	klog
 
 DESKTOP_ENTRIES=	"KLog" "Simple Amateur Radio Logging Program" \
 		"" "klog" "Network;HamRadio;" \
 		true
 
 PLIST_FILES=	bin/klog \
 		${DATADIR}/translations/klog_ca.qm \
+		${DATADIR}/translations/klog_cs.qm \
+		${DATADIR}/translations/klog_da.qm \
 		${DATADIR}/translations/klog_de.qm \
 		${DATADIR}/translations/klog_es.qm \
-		${DATADIR}/translations/klog_fr.qm \
-		${DATADIR}/translations/klog_ja.qm \
-		${DATADIR}/translations/klog_da.qm \
 		${DATADIR}/translations/klog_fi.qm \
+		${DATADIR}/translations/klog_fr.qm \
 		${DATADIR}/translations/klog_hr.qm \
 		${DATADIR}/translations/klog_it.qm \
+		${DATADIR}/translations/klog_ja.qm \
 		${DATADIR}/translations/klog_pl.qm \
 		man/man1/klog.1.gz
 
 post-patch:
-	@${REINPLACE_CMD} '/"\/usr\/share\/klog\/translations\/klog_" + \
-		QLocale::system().name()/\
-		s|);|, "${DATADIR}/translations/");|' \
-			${WRKSRC}/main.cpp
-
-#post-build:
-#	${LRELEASE} ${WRKSRC}/${PORTNAME}.pro
+	@${REINPLACE_CMD} \
+	's|"\/usr\/share\/klog\/translations\/klog_"|"${DATADIR}/translations/klog_"|' \
+	${WRKSRC}/src/main.cpp
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/build/target/klog ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/build/target/klog ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DATADIR}/translations
-	${INSTALL_DATA} ${WRKSRC}/build/target/translations/klog_*.qm \
+	${INSTALL_DATA} ${WRKSRC}/src/build/target/translations/klog_*.qm \
 		${STAGEDIR}${DATADIR}/translations
-	${INSTALL_MAN} ${WRKSRC}/klog.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/src/klog.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/comms/klog/distinfo b/comms/klog/distinfo
index cb12811d54aa..8b7bdd97327c 100644
--- a/comms/klog/distinfo
+++ b/comms/klog/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567980395
-SHA256 (klog-0.9.8.1.tar.gz) = 068106b8e8a6aac2f62e7b5c9280a7aa97fe35bb11d37764039df2ab998ad36d
-SIZE (klog-0.9.8.1.tar.gz) = 2064170
+TIMESTAMP = 1635417161
+SHA256 (ea4k-klog-1.8.5_GH0.tar.gz) = 4b38dfb7d527871bdd36b3652cf92af214de1a69068816b6675deafe54e4cc71
+SIZE (ea4k-klog-1.8.5_GH0.tar.gz) = 3455827