diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile
index 98b378c..6b65b48 100644
--- a/devel/hg-git/Makefile
+++ b/devel/hg-git/Makefile
@@ -12,17 +12,15 @@ COMMENT=	Mercurial extension to pull from or push to a Git repository
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}dulwich>=0.8.7:${PORTSDIR}/devel/dulwich \
-		mercurial>=2.5.2:${PORTSDIR}/devel/mercurial \
+RUN_DEPENDS=	${PKGNAMEPREFIX}dulwich>=*:${PORTSDIR}/devel/dulwich \
+		mercurial>=*:${PORTSDIR}/devel/mercurial \
 		${PKGNAMEPREFIX}ordereddict>=1.1:${PORTSDIR}/devel/py-ordereddict
 
-
-USE_PYTHON=	-2.7
+USE_PYTHON=	2
 USE_PYDISTUTILS=yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	${PORTNAME:S/-/_/}
 
-NO_STAGE=	yes
 post-install:
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/devel/hg-git/files/patch-hggit__git_handler.py b/devel/hg-git/files/patch-hggit__git_handler.py
new file mode 100644
index 0000000..9901ae9
--- /dev/null
+++ b/devel/hg-git/files/patch-hggit__git_handler.py
@@ -0,0 +1,11 @@
+--- ./hggit/git_handler.py.orig	2013-03-24 22:35:51.000000000 +0100
++++ ./hggit/git_handler.py	2013-10-05 10:40:01.222598222 +0200
+@@ -1034,7 +1034,7 @@
+                         and ( ref.startswith('refs/heads/') or ref.startswith('refs/tags/') ) ]
+             want = [x for x in want if x not in self.git]
+             return want
+-        f, commit = self.git.object_store.add_pack()
++        f, commit = self.git.object_store.add_pack()[:2]
+         try:
+             try:
+                 progress = GitProgress(self.ui)
diff --git a/devel/hg-git/pkg-message b/devel/hg-git/pkg-message
index 4939963..8b74b54 100644
--- a/devel/hg-git/pkg-message
+++ b/devel/hg-git/pkg-message
@@ -1,15 +1,14 @@
 ====
 
-*** WARNING: Do not use this software in data critical production environments,
-only in safe test environments! This software is still BETA! ***
+To enable the Hg-Git extension it has to be added in either
 
-To enable the Hg-Git extension make sure you have the following lines in your
-Mercurial global configuration file '~/.hgrc':
+'$PREFIX/etc/mercurial/hgrc' (per-system),
+'$HOME/.hgrc' (per-user) or
+'<repo>/.hg/hgrc' (per-repository)
+
+Mercurial configuration file:
 
 [extensions]
 hggit =
 
-Note: As of Mercurial 1.8 the required bookmarks extension became a core
-functionality and can be removed from the extensions list.
-
 ====
diff --git a/devel/hg-git/pkg-plist b/devel/hg-git/pkg-plist
deleted file mode 100644
index 279e14b..0000000
--- a/devel/hg-git/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-%%PYTHON_SITELIBDIR%%/hggit/__init__.py
-%%PYTHON_SITELIBDIR%%/hggit/__init__.pyc
-%%PYTHON_SITELIBDIR%%/hggit/__init__.pyo
-%%PYTHON_SITELIBDIR%%/hggit/_ssh.py
-%%PYTHON_SITELIBDIR%%/hggit/_ssh.pyc
-%%PYTHON_SITELIBDIR%%/hggit/_ssh.pyo
-%%PYTHON_SITELIBDIR%%/hggit/git_handler.py
-%%PYTHON_SITELIBDIR%%/hggit/git_handler.pyc
-%%PYTHON_SITELIBDIR%%/hggit/git_handler.pyo
-%%PYTHON_SITELIBDIR%%/hggit/gitrepo.py
-%%PYTHON_SITELIBDIR%%/hggit/gitrepo.pyc
-%%PYTHON_SITELIBDIR%%/hggit/gitrepo.pyo
-%%PYTHON_SITELIBDIR%%/hggit/hgrepo.py
-%%PYTHON_SITELIBDIR%%/hggit/hgrepo.pyc
-%%PYTHON_SITELIBDIR%%/hggit/hgrepo.pyo
-%%PYTHON_SITELIBDIR%%/hggit/overlay.py
-%%PYTHON_SITELIBDIR%%/hggit/overlay.pyc
-%%PYTHON_SITELIBDIR%%/hggit/overlay.pyo
-%%PYTHON_SITELIBDIR%%/hggit/util.py
-%%PYTHON_SITELIBDIR%%/hggit/util.pyc
-%%PYTHON_SITELIBDIR%%/hggit/util.pyo
-%%PYTHON_SITELIBDIR%%/hggit/help/git.rst
-@dirrm %%PYTHON_SITELIBDIR%%/hggit/help
-@dirrm %%PYTHON_SITELIBDIR%%/hggit