diff --git a/textproc/man2html/Makefile b/textproc/man2html/Makefile
index eaf4685c169d..35633c3ecc46 100644
--- a/textproc/man2html/Makefile
+++ b/textproc/man2html/Makefile
@@ -1,40 +1,33 @@
 # Created by: Dima Sivachenko <demon@gpad.ac.ru>
 
 PORTNAME=	man2html
-PORTVERSION=	3.1.20220109
+DISTVERSION=	3.1.20220712
 CATEGORIES=	textproc
-MASTER_SITES=	https://invisible-island.net/archives/scripts/:dickey \
-		http://people.freebsd.org/~demon/:demon \
-		http://fuz.su/~fuz/distfiles/man2html/:demon
-DISTNAME=	other-scripts-${PORTVERSION:E}
-DISTFILES=	${DISTNAME}.tgz:dickey \
-		man2html3.0.1.tar.gz:demon # for cgi script and man page
+MASTER_SITES=	https://invisible-island.net/archives/man2html/
+DISTNAME=	man2html-${DISTVERSION:E}
 
 MAINTAINER=	fuz@fuz.su
 COMMENT=	Convert nroff(1) man pages to HTML
 
 LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		perl5 tar:tgz shebangfix
+USES=		perl5 shebangfix tar:tgz
 USE_PERL5=	run
-SHEBANG_FILES=	man2html man.cgi
+SHEBANG_FILES=	man.cgi man2html
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 CGIDIR=		${PREFIX}/www/cgi-bin
 
-PLIST_FILES=	bin/man2html man/man1/man2html.1.gz www/cgi-bin/man.cgi
-
-# New upstream doesn't ship the man page and CGI script
-# Rip it from the 3.0.1 tarball.
-post-extract:
-	@${MV} ${WRKDIR}/man2html3.0.1/doc/man2html.1 ${WRKSRC}/
-	@${MV} ${WRKDIR}/man2html3.0.1/man.cgi ${WRKSRC}/
+PLIST_FILES=	bin/man2html \
+		man/man1/man2html.1.gz \
+		www/cgi-bin/man.cgi
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/man2html ${STAGEDIR}/${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man2html.1 ${STAGEDIR}/${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/man2html.1 ${STAGEDIR}/${PREFIX}/man/man1
 	${MKDIR} ${STAGEDIR}${CGIDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/man.cgi ${STAGEDIR}${CGIDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/man2html/distinfo b/textproc/man2html/distinfo
index 43e8711db076..18b31d28264f 100644
--- a/textproc/man2html/distinfo
+++ b/textproc/man2html/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1657507856
-SHA256 (other-scripts-20220109.tgz) = 78f5e7eabfb34f2f18a59f22d20c629eae33848679be477c5317502574a49622
-SIZE (other-scripts-20220109.tgz) = 110040
-SHA256 (man2html3.0.1.tar.gz) = a3dd7fdd80785c14c2f5fa54a59bf93ca5f86f026612f68770a0507a3d4e5a29
-SIZE (man2html3.0.1.tar.gz) = 45371
+TIMESTAMP = 1657809557
+SHA256 (man2html-20220712.tgz) = 7f123d9f40ae4e3fd06e182e8a39d3cec201ae33c48ae0a1ce538bd84f1fea61
+SIZE (man2html-20220712.tgz) = 50617