diff --git a/net/waypipe/Makefile b/net/waypipe/Makefile
index 2a371a76c71b..b069a3b764b2 100644
--- a/net/waypipe/Makefile
+++ b/net/waypipe/Makefile
@@ -2,13 +2,9 @@
 
 PORTNAME=	waypipe
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.1
-PORTREVISION=	1
+DISTVERSION=	0.7.0
 CATEGORIES=	net
 
-PATCH_SITES=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
-PATCHFILES+=	9f0b9f2e8929.diff:-p1
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Network transparency with Wayland
 
@@ -22,7 +18,7 @@ USES=		compiler:c11 localbase:ldflags meson pkgconfig
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.freedesktop.org
 GL_ACCOUNT=	mstoeckl
-GL_COMMIT=	f78ad85b04ef95daa9a1671aa0375d0e77d19b2f
+GL_COMMIT=	5eef66b997400d7beecc2ef914f59b27e5505b2c
 PLIST_FILES=	bin/${PORTNAME}
 
 OPTIONS_DEFINE=	FFMPEG LZ4 MANPAGES OPENGL VAAPI ZSTD
@@ -50,4 +46,10 @@ VAAPI_IMPLIES=		FFMPEG
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_MESON_ENABLED=	with_zstd
 
+post-patch:
+# Extract (snapshot) version from the port instead of meson.build
+	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
+		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
+		${WRKSRC}/meson.build
+
 .include <bsd.port.mk>
diff --git a/net/waypipe/distinfo b/net/waypipe/distinfo
index cdcd6ab3c814..3edd0e10e30e 100644
--- a/net/waypipe/distinfo
+++ b/net/waypipe/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1566861480
-SHA256 (mstoeckl-waypipe-f78ad85b04ef95daa9a1671aa0375d0e77d19b2f_GL0.tar.gz) = 4bbfcc046ebde67e210433ab7efbb2d92cea62d7088fc2a95405caf8d93d5593
-SIZE (mstoeckl-waypipe-f78ad85b04ef95daa9a1671aa0375d0e77d19b2f_GL0.tar.gz) = 143440
-SHA256 (9f0b9f2e8929.diff) = 729192f4f8ed77b6f0f1c247fce602711be09c50bc6fe292d16e30621191a7c3
-SIZE (9f0b9f2e8929.diff) = 2201
+TIMESTAMP = 1593994612
+SHA256 (mstoeckl-waypipe-5eef66b997400d7beecc2ef914f59b27e5505b2c_GL0.tar.gz) = 6602976682ee58d64295288d8633b1a124730365d2e286da9e5d7deda3ab26a0
+SIZE (mstoeckl-waypipe-5eef66b997400d7beecc2ef914f59b27e5505b2c_GL0.tar.gz) = 145277