diff --git a/audio/moony-lv2/Makefile b/audio/moony-lv2/Makefile
index bc82d0d9f1b8..4d414f18a85f 100644
--- a/audio/moony-lv2/Makefile
+++ b/audio/moony-lv2/Makefile
@@ -1,24 +1,22 @@
 PORTNAME=	moony
 DISTVERSION=	0.36.0
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	https://gitlab.com/OpenMusicKontrollers/moony.lv2/repository/archive.tar.gz?ref=${PORTVERSION}&dummy=/
+MASTER_SITES=	https://git.open-music-kontrollers.ch/lv2/moony.lv2/snapshot/
 PKGNAMESUFFIX=	-lv2
+DISTNAME=	${PORTNAME}.lv2-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Realtime Lua as programmable glue in LV2
 WWW=		https://open-music-kontrollers.ch/lv2/moony
 
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	lv2>0:audio/lv2
 
-USES=		compiler:c++11-lang gl meson pkgconfig xorg
+USES=		compiler:c++11-lang gl meson pkgconfig tar:xz xorg
 USE_XORG=	x11 xext
 USE_GL=		gl glew glu
 
-post-extract:
-	@${MV} ${WRKDIR}/moony* ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 .include <bsd.port.mk>
diff --git a/audio/moony-lv2/distinfo b/audio/moony-lv2/distinfo
index bfd8c759344f..c04600f32759 100644
--- a/audio/moony-lv2/distinfo
+++ b/audio/moony-lv2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613369617
-SHA256 (moony-0.36.0.tar.gz) = bb26d04b56c82b48f8e892e3eee1b15482a40de4f524f79b3e7af73d70b7d55d
-SIZE (moony-0.36.0.tar.gz) = 6492221
+TIMESTAMP = 1665376484
+SHA256 (moony.lv2-0.36.0.tar.xz) = 825d4c6449dbe5c8efd629c38e41128cb3941e5c1b3b8c75d852a36b669ea484
+SIZE (moony.lv2-0.36.0.tar.xz) = 5186096