diff --git a/x11/fuzzel/Makefile b/x11/fuzzel/Makefile
index 78ba21b1a35a..502c8b393d98 100644
--- a/x11/fuzzel/Makefile
+++ b/x11/fuzzel/Makefile
@@ -1,48 +1,50 @@
 PORTNAME=	fuzzel
-DISTVERSION=	1.6.3
-PORTREVISION=	1
+DISTVERSION=	1.6.4
 CATEGORIES=	x11
 MASTER_SITES=	https://codeberg.org/dnkl/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Application launcher for wlroots-based Wayland compositors
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	tllist>=1.0.1:devel/tllist \
 		wayland-protocols>0:graphics/wayland-protocols \
 		scdoc:textproc/scdoc
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 		libwayland-client.so:graphics/wayland \
 		libfcft.so:x11-fonts/fcft \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 meson pkgconfig xorg
 USE_XORG=	pixman
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz \
 		share/zsh/site-functions/_${PORTNAME}
 
 OPTIONS_DEFINE=	CAIRO LIBRSVG2 PNG
 OPTIONS_DEFAULT=CAIRO LIBRSVG2 PNG
 
 CAIRO_USES=		gnome
 CAIRO_USE=		GNOME=cairo
 CAIRO_MESON_ENABLED=	enable-cairo
 
 LIBRSVG2_USES=		gnome
 LIBRSVG2_USE=		GNOME=librsvg2
-LIBRSVG2_MESON_ENABLED=	enable-svg
+LIBRSVG2_MESON_ON=	-Dsvg-backend=librsvg
+LIBRSVG2_MESON_OFF=	-Dsvg-backend=nanosvg
+LIBRSVG2_IMPLIES=	CAIRO
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
-PNG_MESON_ENABLED=	enable-png
+PNG_MESON_ON=		-Dpng-backend=libpng
+PNG_MESON_OFF=		-Dpng-backend=none
 
 post-patch:
 # Respect PREFIX for icons
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/completions/zsh/_${PORTNAME} \
 		${WRKSRC}/xdg.c
 
 .include <bsd.port.mk>
diff --git a/x11/fuzzel/distinfo b/x11/fuzzel/distinfo
index bb93b66066e5..8e2c798ddcb3 100644
--- a/x11/fuzzel/distinfo
+++ b/x11/fuzzel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632511174
-SHA256 (fuzzel-1.6.3.tar.gz) = 5debf6e7cfad8f7b21fbf7c5c2f4f22bd9f6f8273f4b658def4fce70e8c4a3a0
-SIZE (fuzzel-1.6.3.tar.gz) = 86691
+TIMESTAMP = 1633776425
+SHA256 (fuzzel-1.6.4.tar.gz) = 69d519c2dbcd53dc6a8e45f81f1240a2ea3ac9f420fffca8fcfce59001d443d7
+SIZE (fuzzel-1.6.4.tar.gz) = 384763