diff --git a/gopher-validator-git/Makefile b/gopher-validator-git/Makefile
index 3c684f6670..9038195a2f 100644
--- a/gopher-validator-git/Makefile
+++ b/gopher-validator-git/Makefile
@@ -1,30 +1,25 @@
 # $NetBSD: Makefile,v 1.2 2018/09/08 14:10:52 leot Exp $
 
-DISTNAME=	gophervalidator-0.1
+DISTNAME=	gopher-validator-0.1
 CATEGORIES=	net
-MASTER_SITES=	http://codemadness.org/releases/gophervalidator/
+MASTER_SITES=	ftp://bitreich.org/releases/gopher-validator/
 
 MAINTAINER=	leot@NetBSD.org
-HOMEPAGE=	http://codemadness.org/git/sfeed/file/README.html
+HOMEPAGE=	gopher://bitreich.org/1/scm/gopher-validator
 COMMENT=	Gopher validator and happy helper
 LICENSE=	isc
 
-GIT_REPOSITORIES=		gophervalidator
-GIT_REPO.gophervalidator=	git://git.codemadness.org/gophervalidator
-WRKSRC=				${WRKDIR}/gophervalidator
+GIT_REPOSITORIES=		gopher-validator
+GIT_REPO.gopher-validator=	git://bitreich.org/gopher-validator
+WRKSRC=				${WRKDIR}/gopher-validator
 
 USE_LANGUAGES=	c99
 
-SUBST_CLASSES+=		makefile
-SUBST_STAGE.makefile=	pre-configure
-SUBST_MESSAGE.makefile=	Adjust Makefile
-SUBST_FILES.makefile=	Makefile
-SUBST_SED.makefile+=	-e '/^LDFLAGS/s,^,\#,'
-
-INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gophervalidator ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/gopher-validator.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/gopher-validator ${DESTDIR}${PREFIX}/bin
 
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/gopher-validator-git/PLIST b/gopher-validator-git/PLIST
index f58ac18ffe..f818bd30a2 100644
--- a/gopher-validator-git/PLIST
+++ b/gopher-validator-git/PLIST
@@ -1,2 +1,3 @@
 @comment $NetBSD$
-bin/gophervalidator
+bin/gopher-validator
+man/man1/gopher-validator.1