diff --git a/devel/muon/Makefile b/devel/muon/Makefile
index c828caed838c..6f12a5c65b7d 100644
--- a/devel/muon/Makefile
+++ b/devel/muon/Makefile
@@ -1,40 +1,39 @@
 PORTNAME=	muon
-PORTVERSION=	0.0.1.p1
+DISTVERSION=	0.0.1.p1
+DISTVERSIONSUFFIX=	-0-gb44e90f
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	https://git.sr.ht/~lattis/muon/archive/
-DISTNAME=	b44e90f
+MASTER_SITES=	https://git.sr.ht/~lattis/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Build system compatible with meson
 WWW=		https://muon.build/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	scdoc:textproc/scdoc
 
 USES=		ninja pkgconfig:both
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTNAME}
 BUILD_WRKSRC=	${WRKSRC}/_build
 INSTALL_WRKSRC=	${WRKSRC}/_build
 
 ALL_TARGET=
 PLIST_FILES=	bin/muon \
 		share/man/man1/muon.1.gz \
 		share/man/man5/meson.build.5.gz
 
 post-patch:
 # this confuses some of the FreeBSD configure targets
 	@${RM} -r ${WRKSRC}/tests/project/common
 
 do-configure:
 	@(cd ${WRKSRC} && \
 		${SH} bootstrap.sh && \
 		./muon setup -Dlibcurl=disabled -Dlibarchive=disabled ${BUILD_WRKSRC})
 
 do-install:
 	@(${SETENV} ${MAKE_ENV} ${BUILD_WRKSRC}/muon -C ${BUILD_WRKSRC} install)
 
 .include <bsd.port.mk>
diff --git a/devel/muon/distinfo b/devel/muon/distinfo
index 25d52fb3e3d9..821f8fda8052 100644
--- a/devel/muon/distinfo
+++ b/devel/muon/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1659537739
-SHA256 (b44e90f.tar.gz) = 926d5de4b4cee8ca047168d0611824081a982592349bc2fb0ddb99bcee07f79b
-SIZE (b44e90f.tar.gz) = 442889
+SHA256 (muon-0.0.1.p1-0-gb44e90f.tar.gz) = dd49f56020e25a472609028b67dbd12e092dad2aae35262894cfd7728d2c830e
+SIZE (muon-0.0.1.p1-0-gb44e90f.tar.gz) = 443017