diff --git a/editors/focuswriter/Makefile b/editors/focuswriter/Makefile
index d5188b5a1cda..ec322a22270d 100644
--- a/editors/focuswriter/Makefile
+++ b/editors/focuswriter/Makefile
@@ -1,40 +1,28 @@
 PORTNAME=	focuswriter
-DISTVERSIONPREFIX=	v
-DISTVERSION=	1.7.6
-PORTREVISION=	1
+DISTVERSION=	1.8.2
 CATEGORIES=	editors
+MASTER_SITES=	https://gottcode.org/${PORTNAME}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Simple, distraction-free writing environment
 
 LICENSE=	GPLv3+ LGPL3+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/resources/images/icons/oxygen/COPYING
 
 LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell
 
-USES=		compiler:c++11-lib desktop-file-utils gl pkgconfig qmake qt:5
-USE_GITHUB=	yes
-GH_ACCOUNT=	gottcode
+USES=		cmake compiler:c++17-lang desktop-file-utils gl iconv pkgconfig \
+		qt:6 tar:bz2
 USE_GL=		gl
-USE_QT=		concurrent core gui multimedia network printsupport widgets \
-		buildtools_build linguisttools_build
+USE_QT=		base multimedia tools_build
 
 PORTDATA=	*
-PORTDOCS=	ChangeLog CREDITS README
-
+PORTDOCS=	CREDITS ChangeLog README
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e '/INSTALLS/s/man //' \
-		${WRKSRC}/focuswriter.pro
-
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/resources/unix/focuswriter.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1
-
 post-install-DOCS-on:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/focuswriter/distinfo b/editors/focuswriter/distinfo
index d14b583eb2d4..93327dd4e98b 100644
--- a/editors/focuswriter/distinfo
+++ b/editors/focuswriter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587429332
-SHA256 (gottcode-focuswriter-v1.7.6_GH0.tar.gz) = bbf70def7d86ee18cabe9f8ac3922ebbf4dfdb36893df3e6fa3e026acfcb2057
-SIZE (gottcode-focuswriter-v1.7.6_GH0.tar.gz) = 10513715
+TIMESTAMP = 1662112781
+SHA256 (focuswriter-1.8.2.tar.bz2) = 9fd6384009a33840218c653bb8d3ab69af5e80de884d7be3cd778500484cb583
+SIZE (focuswriter-1.8.2.tar.bz2) = 10342213
diff --git a/editors/focuswriter/pkg-plist b/editors/focuswriter/pkg-plist
index 3c30aeaecf83..bf228795a72e 100644
--- a/editors/focuswriter/pkg-plist
+++ b/editors/focuswriter/pkg-plist
@@ -1,16 +1,15 @@
 bin/focuswriter
-man/man1/focuswriter.1.gz
+share/man/man1/focuswriter.1.gz
 share/metainfo/focuswriter.appdata.xml
 share/applications/focuswriter.desktop
 share/icons/hicolor/1024x1024/apps/focuswriter.png
 share/icons/hicolor/128x128/apps/focuswriter.png
 share/icons/hicolor/16x16/apps/focuswriter.png
 share/icons/hicolor/22x22/apps/focuswriter.png
 share/icons/hicolor/24x24/apps/focuswriter.png
 share/icons/hicolor/256x256/apps/focuswriter.png
 share/icons/hicolor/32x32/apps/focuswriter.png
 share/icons/hicolor/48x48/apps/focuswriter.png
 share/icons/hicolor/512x512/apps/focuswriter.png
 share/icons/hicolor/64x64/apps/focuswriter.png
 share/icons/hicolor/scalable/apps/focuswriter.svg
-share/pixmaps/focuswriter.xpm