diff --git a/textproc/txt2man/Makefile b/textproc/txt2man/Makefile
index b3dffa5737f4..480f7009e2b3 100644
--- a/textproc/txt2man/Makefile
+++ b/textproc/txt2man/Makefile
@@ -2,29 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	txt2man
-PORTVERSION=	1.5.6
+DISTVERSIONPREFIX=	txt2man-
+DISTVERSION=	1.6.0
 CATEGORIES=	textproc
-MASTER_SITES=	http://mvertes.free.fr/download/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Converts flat ASCII text to man page format
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gawk:lang/gawk
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+RUN_DEPENDS=	gawk:lang/gawk
 
 USES=		cpe gmake
+CPE_VENDOR=	marc_vertes
+USE_GITHUB=	yes
+GH_ACCOUNT=	mvertes
+
 MAKE_ENV=	prefix=${STAGEDIR}${PREFIX}
 NO_ARCH=	yes
 
-CPE_VENDER=	marc_vertes
-
 PLIST_FILES=	bin/bookman bin/src2man bin/txt2man \
 		man/man1/bookman.1.gz man/man1/src2man.1.gz man/man1/txt2man.1.gz
 
 post-patch:
+	@${REINPLACE_CMD} 's,share/man,man,g' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's,awk,gawk,' ${WRKSRC}/bookman ${WRKSRC}/src2man
 	@${REINPLACE_CMD} '/exec ksh/d' ${WRKSRC}/txt2man
 
diff --git a/textproc/txt2man/distinfo b/textproc/txt2man/distinfo
index 2e2302d4aa3c..cfcb875d9cbf 100644
--- a/textproc/txt2man/distinfo
+++ b/textproc/txt2man/distinfo
@@ -1,2 +1,3 @@
-SHA256 (txt2man-1.5.6.tar.gz) = 984825c5fd0cb3495160bf3277f327078081a8dc219dc466509e307ec9a2b52a
-SIZE (txt2man-1.5.6.tar.gz) = 16293
+TIMESTAMP = 1555587660
+SHA256 (mvertes-txt2man-txt2man-1.6.0_GH0.tar.gz) = f6939e333a12e1ecceccaa547b58f4bf901a580cd2d8f822f8c292934c920c99
+SIZE (mvertes-txt2man-txt2man-1.6.0_GH0.tar.gz) = 16941
diff --git a/textproc/txt2man/pkg-descr b/textproc/txt2man/pkg-descr
index 304a23d4555b..aac469673b88 100644
--- a/textproc/txt2man/pkg-descr
+++ b/textproc/txt2man/pkg-descr
@@ -4,4 +4,4 @@ man pages. Smart argument processing is available either for commands using
 omitted, standard input is taken as argument. Result is displayed on standard
 output.
 
-WWW: http://mvertes.free.fr/
+WWW: https://github.com/mvertes/txt2man