diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile
index 6c12e01d5032..11b53e102526 100644
--- a/devel/hg-git/Makefile
+++ b/devel/hg-git/Makefile
@@ -1,32 +1,32 @@
 # Created by: Marco Broeder <marco.broeder@posteo.eu>
 # $FreeBSD$
 
 PORTNAME=	hg-git
-PORTVERSION=	0.8.5.20161206
+PORTVERSION=	0.8.6
 CATEGORIES=	devel python
 MASTER_SITES=	http://bitbucket.org/durin42/${PORTNAME}/get/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	fa23c454c528
+DISTNAME=	${PORTVERSION}
 
 MAINTAINER=	marco.broeder@posteo.eu
 COMMENT=	Mercurial extension to pull from or push to a Git repository
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PKGNAMEPREFIX}dulwich>=*:devel/dulwich \
 		mercurial>=*:devel/mercurial
 
 PORTDOCS=	README.md
 
 NO_ARCH=	yes
-WRKSRC=		${WRKDIR}/durin42-${PORTNAME}-${DISTNAME}
+WRKSRC=		${WRKDIR}/durin42-${PORTNAME}-1bd9d9a0201c
 USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/)
 
 .include <bsd.port.mk>
diff --git a/devel/hg-git/distinfo b/devel/hg-git/distinfo
index 3930120f14ee..828cd941a60c 100644
--- a/devel/hg-git/distinfo
+++ b/devel/hg-git/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481296489
-SHA256 (fa23c454c528.tar.gz) = 51e3827799e96b66f6872ac995f902b79c93c4f79a761608a6a587820f7d52ba
-SIZE (fa23c454c528.tar.gz) = 102686
+TIMESTAMP = 1497355521
+SHA256 (0.8.6.tar.gz) = 71f85d995251cae8f54bef08db893c967bd93966eabaa87fad1814ef8ef0b867
+SIZE (0.8.6.tar.gz) = 104112