diff --git a/net/wayvnc/Makefile b/net/wayvnc/Makefile
index 59d0277f3f03..3d5d5b60bb13 100644
--- a/net/wayvnc/Makefile
+++ b/net/wayvnc/Makefile
@@ -1,46 +1,55 @@
 PORTNAME=	wayvnc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.0
+DISTVERSION=	0.6.1
 CATEGORIES=	net wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	VNC server for wlroots-based compositors
 WWW=		https://github.com/any1/wayvnc
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		fails to build after https://github.com/any1/neatvnc/commit/8f979c992840
-
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 LIB_DEPENDS=	libaml.so:devel/aml \
+		libjansson.so:devel/jansson \
 		libdrm.so:graphics/libdrm \
 		libwayland-client.so:graphics/wayland \
 		libneatvnc.so:net/neatvnc \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_XORG=	pixman
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	any1
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} \
+		bin/${PORTNAME}ctl
+MESON_ARGS=	-Dtests=false
 
 OPTIONS_DEFINE=	MANPAGES OPENGL
 OPTIONS_DEFAULT=MANPAGES OPENGL
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
-MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz
+MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz \
+			man/man1/${PORTNAME}ctl.1.gz
 
 OPENGL_USES=		gl
 OPENGL_USE=		GL=gbm
 OPENGL_MESON_ENABLED=	screencopy-dmabuf
 
 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
 
+pre-test:
+	@if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \
+		${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
+		${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=true"; \
+		${TOUCH} ${WRKDIR}/.meson_build_tests; \
+	fi
+
 .include <bsd.port.mk>
diff --git a/net/wayvnc/distinfo b/net/wayvnc/distinfo
index e0e1b2a42c63..8dcfe231ee31 100644
--- a/net/wayvnc/distinfo
+++ b/net/wayvnc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1657389799
-SHA256 (any1-wayvnc-v0.5.0_GH0.tar.gz) = d4ea4cee79d13e08e9e7d3573c7f0ccf3709a59cfe582509edc8fe6f406bf88e
-SIZE (any1-wayvnc-v0.5.0_GH0.tar.gz) = 49152
+TIMESTAMP = 1674512798
+SHA256 (any1-wayvnc-v0.6.1_GH0.tar.gz) = 9339c552e2b1f4e88d6c32e437e429f59a2b54dfbf7dbe2c0c338bf3e07e573f
+SIZE (any1-wayvnc-v0.6.1_GH0.tar.gz) = 81246