diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile
index f476bdc37b45..3c23de94e392 100644
--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@@ -1,58 +1,57 @@
 PORTNAME=	tortoisehg
-DISTVERSION=	6.0
-PORTREVISION=	1
+DISTVERSION=	6.1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.mercurial-scm.org/release/tortoisehg/targz/
 
 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} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR}
 
 USES=		pyqt:5 python:3.5+
 USE_PYQT=	qscintilla2 pyqt5
 USE_PYTHON=	autoplist distutils
 
 OPTIONS_DEFINE=	NAUTILUS NLS
 NAUTILUS_DESC=	Install TortoiseHG Nautilus extension
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
 # Do not conflict with devel/mercurial, which also installs hgext3rd/__init__.py
 EXTRACT_AFTER_ARGS=	--exclude ${PORTNAME}-${DISTVERSION}/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 0a14b4d0b08d..e581a1384f5c 100644
--- a/devel/tortoisehg/distinfo
+++ b/devel/tortoisehg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641828567
-SHA256 (tortoisehg-6.0.tar.gz) = db9b90da5945ffec2a746a6e9ff9f396f01fdbce8e2119a5654212674b331fa6
-SIZE (tortoisehg-6.0.tar.gz) = 8918041
+TIMESTAMP = 1647283148
+SHA256 (tortoisehg-6.1.tar.gz) = 506d77065158f4372c08f59a06261aeabda803789e26d4d87d79270e828d9182
+SIZE (tortoisehg-6.1.tar.gz) = 8919383
diff --git a/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py b/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py
index eb4fbc84fd7f..7f7cdaa8cdb4 100644
--- a/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py
+++ b/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py
@@ -1,20 +1,19 @@
---- tortoisehg/util/hgversion.py.orig	2020-04-08 09:44:12 UTC
+--- tortoisehg/util/hgversion.py.orig	2022-03-06 02:33:21 UTC
 +++ tortoisehg/util/hgversion.py
-@@ -19,16 +19,4 @@ except AttributeError:
- testedwith = b'5.2 5.3'
+@@ -33,15 +33,7 @@ def checkhgversion(v):
+     return vers
  
  def checkhgversion(v):
 -    """range check the Mercurial version"""
 -    reqvers = testedwith.split()
--    v = v.split(b'+')[0]
--    if not v or v == b'unknown' or len(v) >= 12:
--        # can't make any intelligent decisions about unknown or hashes
--        return
--    vers = re.split(br'\.|-|rc', v)[:2]
--    if len(vers) < 2:
+-    vers = _splitversion(v)
+-    if not vers:
 -        return
 -    if b'.'.join(vers) in reqvers:
 -        return
 -    return (b'This version of TortoiseHg requires Mercurial version %s.n to '
 -            b'%s.n, but found %s') % (reqvers[0], reqvers[-1], v)
 +    return
+ 
+ def checkminhgversion(v):
+     """Check if the given Mercurial version is not lower than the minimum