diff --git a/Makefile b/Makefile
index ea3bb4d110..55fa059738 100644
--- a/Makefile
+++ b/Makefile
@@ -1211,6 +1211,7 @@ SUBDIR+=	gonepass-git
 SUBDIR+=	google-perftools
 SUBDIR+=	googlecl
 SUBDIR+=	gopass
+SUBDIR+=	gophervalidator-git
 SUBDIR+=	gopkgdep
 SUBDIR+=	gpak
 SUBDIR+=	gplbasic
diff --git a/gophervalidator-git/DESCR b/gophervalidator-git/DESCR
new file mode 100644
index 0000000000..42b1f5a1df
--- /dev/null
+++ b/gophervalidator-git/DESCR
@@ -0,0 +1 @@
+Gopher validator and happy helper
diff --git a/gophervalidator-git/Makefile b/gophervalidator-git/Makefile
new file mode 100644
index 0000000000..3c684f6670
--- /dev/null
+++ b/gophervalidator-git/Makefile
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile,v 1.2 2018/09/08 14:10:52 leot Exp $
+
+DISTNAME=	gophervalidator-0.1
+CATEGORIES=	net
+MASTER_SITES=	http://codemadness.org/releases/gophervalidator/
+
+MAINTAINER=	leot@NetBSD.org
+HOMEPAGE=	http://codemadness.org/git/sfeed/file/README.html
+COMMENT=	Gopher validator and happy helper
+LICENSE=	isc
+
+GIT_REPOSITORIES=		gophervalidator
+GIT_REPO.gophervalidator=	git://git.codemadness.org/gophervalidator
+WRKSRC=				${WRKDIR}/gophervalidator
+
+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
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/gophervalidator ${DESTDIR}${PREFIX}/bin
+
+.include "../../wip/mk/git-package.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/gophervalidator-git/PLIST b/gophervalidator-git/PLIST
new file mode 100644
index 0000000000..f58ac18ffe
--- /dev/null
+++ b/gophervalidator-git/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+bin/gophervalidator