diff --git a/x11-fonts/agave/Makefile b/x11-fonts/agave/Makefile
index 5be14af6d919..ce650d2b6fbc 100644
--- a/x11-fonts/agave/Makefile
+++ b/x11-fonts/agave/Makefile
@@ -1,27 +1,31 @@
 PORTNAME=	agave
-PORTVERSION=	38
+DISTVERSION=	38
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	TrueType monospaced font designed for X environments
 WWW=		https://b.agaric.net/page/agave
 
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/../LICENSE
-
-BUILD_DEPENDS=	fontforge:print/fontforge \
-		ttfautohint:print/ttfautohint
+LICENSE=	OFL11
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe fonts
 CPE_VENDOR=	anomali
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	blobject
+
 NO_ARCH=	yes
+NO_BUILD=	yes
 
-WRKSRC_SUBDIR=	src
+EXTRACT_AFTER_ARGS=	--include ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/LICENSE \
+			--include ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/dist/*.ttf \
+			--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/dist/*-slashed.ttf \
+			--no-same-owner --no-same-permissions
 
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/dist/*.ttf ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/agave/pkg-plist b/x11-fonts/agave/pkg-plist
index 1f1561ffdd44..f3d0a2dc8294 100644
--- a/x11-fonts/agave/pkg-plist
+++ b/x11-fonts/agave/pkg-plist
@@ -1,4 +1,2 @@
-%%FONTSDIR%%/agave-b.ttf
-%%FONTSDIR%%/agave-i.ttf
-%%FONTSDIR%%/agave-r.ttf
-%%FONTSDIR%%/agave-z.ttf
+%%FONTSDIR%%/Agave-Bold.ttf
+%%FONTSDIR%%/Agave-Regular.ttf