diff --git a/devel/muon/Makefile b/devel/muon/Makefile
index 62e9d5ba1316..d78f1a01d1fc 100644
--- a/devel/muon/Makefile
+++ b/devel/muon/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	muon
 DISTVERSION=	0.5.0
 CATEGORIES=	devel
 MASTER_SITES=	https://muon.build/releases/v${DISTVERSION}/ \
 		https://muon.build/releases/v${DISTVERSION}/docs/:docs
-DISTFILES+=	${PORTNAME}-v${DISTVERSION}${EXTRACT_SUFX} \
+DISTFILES=	${PORTNAME}-v${DISTVERSION}${EXTRACT_SUFX} \
 		man.tar.gz:docs
-DIST_SUBDIR=	muon
+DIST_SUBDIR=	${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Build system compatible with meson
 WWW=		https://muon.build/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSES/GPL-3.0-only.txt
 
 USES=		ninja:samurai pkgconfig:both
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-v${DISTVERSION}
 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
-USE_CSTD=	c99
+
 CFLAGS+=	-D__XSI_VISIBLE=1
 CONFIGURE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
 
 do-configure:
 	@(cd ${WRKSRC} && \
 		${SETENVI} ${CONFIGURE_ENV} ${SH} bootstrap.sh . && \
 		${SETENVI} ${CONFIGURE_ENV} ./muon-bootstrap setup \
 			-Dlibcurl=disabled \
 			-Dlibarchive=disabled \
 			-Dtracy=disabled \
 			-Dmeson-tests=disabled \
 			-Dmeson-docs=disabled \
 			-Dlibpkgconf=enabled \
 			${BUILD_WRKSRC})
 
 do-install:
 	@(${SETENVI} ${MAKE_ENV} ${BUILD_WRKSRC}/muon -C ${BUILD_WRKSRC} install)
 	@${INSTALL_MAN} ${WRKDIR}/man/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${INSTALL_MAN} ${WRKDIR}/man/*.5 ${STAGEDIR}${PREFIX}/share/man/man5
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/muon/distinfo b/devel/muon/distinfo
index 0964141a4fb5..f03363550812 100644
--- a/devel/muon/distinfo
+++ b/devel/muon/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1762246753
-SHA256 (muon/muon-v0.5.0.tar.gz) = 24aa4d29ed272893f6e6d355b1ec4ef20647438454e88161bdb9defd7c6faf77
-SIZE (muon/muon-v0.5.0.tar.gz) = 1262546
-SHA256 (muon/man.tar.gz) = 4e72fa1887c4d0ce3f4f3c5e03faf8fbf465c95fd48e022b796477926adf3ee5
-SIZE (muon/man.tar.gz) = 8172
+TIMESTAMP = 1762283304
+SHA256 (muon/0.5.0/muon-v0.5.0.tar.gz) = 24aa4d29ed272893f6e6d355b1ec4ef20647438454e88161bdb9defd7c6faf77
+SIZE (muon/0.5.0/muon-v0.5.0.tar.gz) = 1262546
+SHA256 (muon/0.5.0/man.tar.gz) = 4e72fa1887c4d0ce3f4f3c5e03faf8fbf465c95fd48e022b796477926adf3ee5
+SIZE (muon/0.5.0/man.tar.gz) = 8172