diff --git a/devel/hare/Makefile b/devel/hare/Makefile
index b004173e1507..7f212dfd5a57 100644
--- a/devel/hare/Makefile
+++ b/devel/hare/Makefile
@@ -1,47 +1,46 @@
 PORTNAME=	hare
-PORTVERSION=	g20220428
+PORTVERSION=	g20220430
 CATEGORIES=	devel
 MASTER_SITES=	https://git.sr.ht/~sircmpwn/${PORTNAME}/archive/
-DISTNAME=	1bfb2e6d
+PKGNAMESUFFIX=	-lang
+DISTNAME=	51884435
 DIST_SUBDIR=	hare
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Hare language build system and standard library
 
 LICENSE=	MPL20 GPLv3
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 # aarch64 riscv64
 
 BUILD_DEPENDS=	harec:lang/harec \
 		qbe:devel/qbe \
 		scdoc:textproc/scdoc
 RUN_DEPENDS=	harec:lang/harec \
 		qbe:devel/qbe
 
-USES=		gmake
-
 MAKE_ARGS=	DESTDIR=${STAGEDIR}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 MAKE_ARGS+=	ARCH=x86_64
 .endif
 
 pre-build:
 		${CP} ${FILESDIR}/config.mk ${WRKSRC}
 
 post-stage:
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 		${MV} ${STAGEDIR}${DATADIR}/src/hare/* ${STAGEDIR}${DATADIR}/
 		${MKDIR} ${STAGEDIR}${DOCSDIR}
 		${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
 		${INSTALL_DATA} ${WRKSRC}/docs/*.md ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.post.mk>
diff --git a/devel/hare/distinfo b/devel/hare/distinfo
index b59566887e33..8345c93a65ec 100644
--- a/devel/hare/distinfo
+++ b/devel/hare/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1651149951
-SHA256 (hare/1bfb2e6d.tar.gz) = b45ebc2bf887323010ea80c18c8f77b49eb1e6e264b192b59e4082aa80e65178
-SIZE (hare/1bfb2e6d.tar.gz) = 616367
+TIMESTAMP = 1651341990
+SHA256 (hare/51884435.tar.gz) = 79325c1c30d2a63212590e254769409c06732e4f8224ac54c2a93875ea26170e
+SIZE (hare/51884435.tar.gz) = 616472
diff --git a/devel/hare/files/config.mk b/devel/hare/files/config.mk
index c2dbbee23fb8..660ece9f715e 100644
--- a/devel/hare/files/config.mk
+++ b/devel/hare/files/config.mk
@@ -1,32 +1,32 @@
 ## Install configuration
 
 #PREFIX = /usr
 BINDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/man
-DATADIR= $(PREFIX)/share/hare/
+DATADIR= $(PREFIX)/share/hare
 SRCDIR = $(DATADIR)/src
 
 # Where to install the stdlib tree
 STDLIB = $(SRCDIR}/stdlib
 
 # Default HAREPATH
 LOCALSRCDIR = ${SRCDIR}/local-src
 HAREPATH = $(LOCALSRCDIR)/stdlib:$(LOCALSRCDIR)/third-party:$(DATADIR)/stdlib:$(DATADIR)/third-party
 
 ## Build configuration
 
 # Platform to build for
 PLATFORM = freebsd
 #ARCH = x86_64
 
 # External tools and flags
 HAREC = harec
 HAREFLAGS =
 QBE = qbe
 AS = as
 LD = ld
 AR = ar
 SCDOC = scdoc
 
 # Where to store build artifacts
 HARECACHE = .cache