diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile
index 5b8b4d7a7b0b..123ddad2378d 100644
--- a/deskutils/kchmviewer/Makefile
+++ b/deskutils/kchmviewer/Makefile
@@ -1,22 +1,24 @@
 # Created by: Markus Brueffer <markus@FreeBSD.org>
 
 PORTNAME=	kchmviewer
-PORTVERSION=	7.7
-PORTREVISION=	4
+PORTVERSION=	8.0
 CATEGORIES=	deskutils kde
-MASTER_SITES=	SF
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE viewer for CHM files
 
 LIB_DEPENDS=	libchm.so:misc/chmlib \
 		libzip.so:archivers/libzip
 
 USES=		compiler:c++11-lang dos2unix qmake:outsource qt:5 xorg
 USE_QT=		core dbus gui network printsupport webkit widgets xml \
 		buildtools_build qmake_build
 USE_XORG=	x11
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	gyunaev
+GH_TAGNAME=	RELEASE_8_0
+
 DOS2UNIX_GLOB=	*.cpp *.h *.pro *.ui
 
 .include <bsd.port.mk>
diff --git a/deskutils/kchmviewer/distinfo b/deskutils/kchmviewer/distinfo
index e3a6ccad7695..c48d6ee3ae26 100644
--- a/deskutils/kchmviewer/distinfo
+++ b/deskutils/kchmviewer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490818978
-SHA256 (kchmviewer-7.7.tar.gz) = 27cbac45c786b1718550a87e6f86010e161302b426c6396ff2a3091b913b17dd
-SIZE (kchmviewer-7.7.tar.gz) = 345952
+TIMESTAMP = 1622919457
+SHA256 (gyunaev-kchmviewer-8.0-RELEASE_8_0_GH0.tar.gz) = 0eec144b2c09c8b6be98b795f84767098c893bdad7b5a3d11fc5faafead5f9b2
+SIZE (gyunaev-kchmviewer-8.0-RELEASE_8_0_GH0.tar.gz) = 311899
diff --git a/deskutils/kchmviewer/files/patch-src_src.pro b/deskutils/kchmviewer/files/patch-src_src.pro
index 168d09062aaa..fc3acdb7f399 100644
--- a/deskutils/kchmviewer/files/patch-src_src.pro
+++ b/deskutils/kchmviewer/files/patch-src_src.pro
@@ -1,65 +1,65 @@
 This patch contains the following (by hunks)
   1) also link against libX11 on FreeBSD
   2) this is obtained from arch, to fix underlinking
         and
      remove the wrong Qt5 version check
   4) create installation targets
 
---- src/src.pro.orig	2017-03-29 21:21:13 UTC
+--- src/src.pro.orig	2021-06-05 18:58:14 UTC
 +++ src/src.pro
 @@ -67,7 +67,7 @@ QT += webkit \
      webkitwidgets \
      printsupport
-
+ 
 -linux-g++*:{
 +unix:{
      LIBS += -lX11
  }
-
+ 
 @@ -108,26 +108,16 @@ unix:!macx: {
      HEADERS += dbus_interface.h
      SOURCES += dbus_interface.cpp
      CONFIG += dbus
 -    LIBS += ../lib/libebook/libebook.a
 +    LIBS += ../lib/libebook/libebook.a -lchm -lzip
      POST_TARGETDEPS += ../lib/libebook/libebook.a
  }
-
+ 
  greaterThan(QT_MAJOR_VERSION, 4) {
      # Qt 5
 -    greaterThan(QT_MINOR_VERSION, 5) {
 -        # Qt 5.6+
--        error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and is not supported")
+-#        error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and is not supported")
 -        QT += webengine webenginewidgets
 -        DEFINES += USE_WEBENGINE
 -        SOURCES += viewwindow_webengine.cpp dataprovider_qwebengine.cpp
 -        HEADERS += dataprovider_qwebengine.h viewwindow_webengine.h
 -    } else {
 -        # Qt 5.0-5.5
 -        QT += webkit webkitwidgets
 -        DEFINES += USE_WEBKIT
 -        SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp
 -        HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h
 -    }
 +    QT += webkit webkitwidgets
 +    DEFINES += USE_WEBKIT
 +    SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp
 +    HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h
  } else {
      message("Qt4 is not supported anymore, please do not report any errors")
      QT += webkit webkitwidgets
 @@ -135,3 +125,14 @@ greaterThan(QT_MAJOR_VERSION, 4) {
      SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp
      HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h
  }
 +
 +# Define installation target for the binary
 +target.path = $$PREFIX/bin
 +# ... and for the icon
 +icons.files = ../packages/kchmviewer.png
 +icons.path = $$PREFIX/share/pixmaps
 +# ... and the desktop file
 +desktop.files = ../packages/kchmviewer.desktop
 +desktop.path = $$PREFIX/share/applications
 +
 +INSTALLS += desktop icons target