diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile
index adfa3ebec8a7..79bf7403287c 100644
--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@@ -1,65 +1,64 @@
 PORTNAME=	tortoisehg
-DISTVERSION=	5.7.0
-PORTREVISION=	3
+DISTVERSION=	5.8.0
 CATEGORIES=	devel
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	GUI for Mercurial VCS
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 BUILD_DEPENDS=	${PY_MERCURIAL}
 RUN_DEPENDS=	${PY_MERCURIAL} \
 		${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse@${PY_FLAVOR} \
 		${PY_PYGMENTS}
 
 USES=		pyqt:5 python:3.5+
 USE_PYQT=	core gui network qscintilla2 xml
 USE_PYTHON=	distutils autoplist
 
 USE_GITLAB=	yes
 GL_SITE=	https://foss.heptapod.net
 GL_ACCOUNT=	mercurial/tortoisehg
 GL_PROJECT=	thg
-GL_COMMIT=	1be900fc8505ed5a93c900d19d1d8700a1b22aee
-GL_HEPTAPOD_COMMIT=	69fd57f838ac26b5fa1b94560f388a783236c6d4
+GL_COMMIT=	65f0eafe3f398fabe0afbc475e18cd63af81df89
+GL_HEPTAPOD_COMMIT=	9f108b8c92463866721dedda1f3f872e0e2b4344
 
 OPTIONS_DEFINE=	NAUTILUS NLS
 NAUTILUS_DESC=	Install TortoiseHG Nautilus extension
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 WRKSRC=		${WRKDIR}/${GL_PROJECT}-${GL_COMMIT}-${GL_HEPTAPOD_COMMIT}
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
 # Do not conflict with devel/mercurial, which also installs hgext3rd/__init__.py
 EXTRACT_AFTER_ARGS=	--exclude ${GL_PROJECT}-${GL_COMMIT}-${GL_HEPTAPOD_COMMIT}/hgext3rd/__init__.py
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} != ${PYTHON_DEFAULT}
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 .endif
 
 post-patch-NLS-on:
 	@${REINPLACE_CMD} -e 's/^%%NLS%%//' ${WRKSRC}/${PYSETUP}
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e 's/^%%NLS%%/# /' ${WRKSRC}/${PYSETUP}
 
 post-patch-NAUTILUS-on:
 	@${REINPLACE_CMD} -e 's/^%%NAUTILUS%%//' ${WRKSRC}/${PYSETUP}
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/${PYSETUP}
 
 post-patch-NAUTILUS-off:
 	@${REINPLACE_CMD} -e 's/^%%NAUTILUS%%/# /' ${WRKSRC}/${PYSETUP}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/tortoisehg
 	${INSTALL_DATA} ${WRKSRC}/contrib/thg.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/contrib/mergetools.rc ${STAGEDIR}${PREFIX}/share/tortoisehg/
 
 .include <bsd.port.post.mk>
diff --git a/devel/tortoisehg/distinfo b/devel/tortoisehg/distinfo
index afc1ed1f4e5c..206565246303 100644
--- a/devel/tortoisehg/distinfo
+++ b/devel/tortoisehg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613767388
-SHA256 (mercurial/tortoisehg-thg-1be900fc8505ed5a93c900d19d1d8700a1b22aee_GL0.tar.gz) = f6cafc35b59efa1050f3268004b57cb838c83c80be4f2ceb8d361818d0a43572
-SIZE (mercurial/tortoisehg-thg-1be900fc8505ed5a93c900d19d1d8700a1b22aee_GL0.tar.gz) = 8640370
+TIMESTAMP = 1621235474
+SHA256 (mercurial/tortoisehg-thg-65f0eafe3f398fabe0afbc475e18cd63af81df89_GL0.tar.gz) = 7248fb60c88e7f48b39d9090248ebae7b2c9fddbb6d2fae16bb3f6c259f7359f
+SIZE (mercurial/tortoisehg-thg-65f0eafe3f398fabe0afbc475e18cd63af81df89_GL0.tar.gz) = 8652904
diff --git a/devel/tortoisehg/files/patch-contrib_thg.desktop b/devel/tortoisehg/files/patch-contrib_thg.desktop
deleted file mode 100644
index 8c6190e50832..000000000000
--- a/devel/tortoisehg/files/patch-contrib_thg.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/thg.desktop.orig	2021-02-03 05:58:06 UTC
-+++ contrib/thg.desktop
-@@ -5,7 +5,7 @@ GenericName=Version Control GUI
- GenericName[ru]=Графический интерфейс для системы контроля версий
- Comment=GUI application for using Mercurial
- Comment[ru]=Графический интерфейс для Mercurial
--Icon=thg_logo
-+Icon=tortoisehg/scalable/apps/thg
- Exec=thg --nofork
- Categories=Development;RevisionControl;
- X-Desktop-File-Install-Version=0.23
diff --git a/devel/tortoisehg/files/patch-setup.py b/devel/tortoisehg/files/patch-setup.py
index a4b351936a6c..0a8eba8766d4 100644
--- a/devel/tortoisehg/files/patch-setup.py
+++ b/devel/tortoisehg/files/patch-setup.py
@@ -1,41 +1,17 @@
---- setup.py.orig	2021-02-03 05:58:06 UTC
+--- setup.py.orig	2021-05-07 23:55:00 UTC
 +++ setup.py
-@@ -218,8 +218,7 @@ class build_config(Command):
-             'license_path': os.path.join(sharedir, 'doc', 'tortoisehg',
-                                          'Copying.txt.gz'),
-             'locale_path': os.path.join(sharedir, 'locale'),
--            'icon_path': os.path.join(sharedir, 'pixmaps', 'tortoisehg',
--                                      'icons'),
-+            'icon_path': os.path.join(sharedir, 'pixmaps', 'tortoisehg'),
-             'nofork': True,
-             'qt_api': qtcore._detectapi(),
-             }
-@@ -488,7 +487,7 @@ class build(_build_orig):
-          lambda self: 'py2app' in self.distribution.commands),
-         ('build_ui', None),
-         ('build_qrc', lambda self: 'py2exe' in self.distribution.commands),
--        ('build_mo', None),
-+%%NLS%%        ('build_mo', None),
-         ] + _build_orig.sub_commands
- 
- class clean(_clean_orig):
-@@ -723,12 +722,14 @@ def setup_posix():
-     for root, dirs, files in os.walk('icons'):
-         if root == 'icons':
-             dirs.remove('svg')  # drop source of .ico files
--        _data_files.append((os.path.join('share/pixmaps/tortoisehg', root),
-+        if not files:
-+            continue
-+        _data_files.append((os.path.normpath(os.path.join('share/pixmaps/tortoisehg', root.replace("icons", "."))),
-                             [os.path.join(root, f) for f in files]))
+@@ -730,10 +730,10 @@ def setup_posix():
+     # install SVG icon for the desktop file
+     _data_files.append(('share/pixmaps', ['icons/svg/thg_logo.svg']))
+     _data_files.append(('share/doc/tortoisehg', ['COPYING.txt']))
 -    _data_files.extend((os.path.join('share', modir), [mofile])
 -                       for pofile, modir, mofile in _walklocales())
 -    _data_files += [('share/nautilus-python/extensions',
 -                     ['contrib/nautilus-thg.py'])]
 +%%NLS%%    _data_files.extend((os.path.join('share', modir), [mofile])
 +%%NLS%%                       for pofile, modir, mofile in _walklocales())
 +%%NAUTILUS%%    _data_files += [('share/nautilus-python/extensions',
 +%%NAUTILUS%%                     ['contrib/nautilus-thg.py'])]
  
      return _scripts, _packages, _data_files, _extra