diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile
index 196dcb454706..34d7664a4270 100644
--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	tortoisehg
-PORTVERSION=	3.0.1
-PORTREVISION=	1
+PORTVERSION=	3.1.1
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/tortoisehg/targz/downloads/
 #MASTER_SITES=	http://cdn.bitbucket.org/tortoisehg/targz/downloads/
@@ -26,18 +25,15 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.10.2:${PORTSDIR}/devel/py-qt4-co
 		pygmentize:${PORTSDIR}/textproc/py-pygments
 
 OPTIONS_DEFINE=	NAUTILUS NLS
-
-NLS_USES=	gettext
-
 NAUTILUS_DESC=	Install TortoiseHG Nautilus extension
-
 OPTIONS_SUB=	yes
 
+USES=		python
+NLS_USES=	gettext
+
 INSTALLS_ICONS=	yes
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-INSTALLS_EGGINFO=yes
+USE_PYTHON=	distutils
 
 SUB_FILES=	pkg-message
 
diff --git a/devel/tortoisehg/distinfo b/devel/tortoisehg/distinfo
index f4a8f3731529..582320f9ba91 100644
--- a/devel/tortoisehg/distinfo
+++ b/devel/tortoisehg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tortoisehg-3.0.1.tar.gz) = 2a134bd4a6a9bce87e1c7febccac0fd13409b676c1dbb26472d3c19c2415e383
-SIZE (tortoisehg-3.0.1.tar.gz) = 8205546
+SHA256 (tortoisehg-3.1.1.tar.gz) = 95c41ba139dbe5164f612f96f6aff86ad91edd140a3812212656c0829944193c
+SIZE (tortoisehg-3.1.1.tar.gz) = 8198553
diff --git a/devel/tortoisehg/pkg-plist b/devel/tortoisehg/pkg-plist
index 1c08d50e308f..10af2421b932 100644
--- a/devel/tortoisehg/pkg-plist
+++ b/devel/tortoisehg/pkg-plist
@@ -123,9 +123,6 @@ bin/thg
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/lfprompt.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/lfprompt.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/lfprompt.pyo
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/license.py
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/license.pyc
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/license.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/manifestmodel.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/manifestmodel.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/manifestmodel.pyo
@@ -144,9 +141,6 @@ bin/thg
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/mq.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/mq.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/mq.pyo
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/mqutil.py
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/mqutil.pyc
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/mqutil.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/p4pending.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/p4pending.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/p4pending.pyo
@@ -279,9 +273,6 @@ bin/thg
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/visdiff.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/visdiff.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/visdiff.pyo
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/wctxactions.py
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/wctxactions.pyc
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/wctxactions.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/wctxcleaner.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/wctxcleaner.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/wctxcleaner.pyo
@@ -321,6 +312,9 @@ bin/thg
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/gpg.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/gpg.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/gpg.pyo
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/hgdispatch.py
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/hgdispatch.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/hgdispatch.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.pyo