diff --git a/x11/nwg-launchers/Makefile b/x11/nwg-launchers/Makefile
index 6113ac77bbaa..3de49403f486 100644
--- a/x11/nwg-launchers/Makefile
+++ b/x11/nwg-launchers/Makefile
@@ -1,32 +1,36 @@
 PORTNAME=	nwg-launchers
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.0
+DISTVERSION=	0.6.1
 CATEGORIES=	x11
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	GTK-based launchers: application grid, button bar, dmenu for sway and other window managers
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
 
 USES=		compiler:c++17-lang gnome meson pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	gtkmm30
 GH_ACCOUNT=	nwg-piotr
 
-OPTIONS_DEFINE=	GLS
-OPTIONS_DEFAULT=GLS
+OPTIONS_DEFINE=	GLS LIBRSVG2
+OPTIONS_DEFAULT=GLS LIBRSVG2
+OPTIONS_SUB=	yes
 
 GLS_DESC=		Layer-shell support
 GLS_LIB_DEPENDS=	libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
 GLS_MESON_ENABLED=	layer-shell
 
+LIBRSVG2_USE=		GNOME=librsvg2
+LIBRSVG2_MESON_ENABLED=	support-svg
+
 post-patch:
 # Respect PREFIX when looking for .desktop files
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
-		${WRKSRC}/common/nwg_tools.cc \
+		${WRKSRC}/common/nwg_classes.cc \
 		${WRKSRC}/grid/grid_tools.cc
 
 .include <bsd.port.mk>
diff --git a/x11/nwg-launchers/distinfo b/x11/nwg-launchers/distinfo
index 5cc851192451..a968693edc6b 100644
--- a/x11/nwg-launchers/distinfo
+++ b/x11/nwg-launchers/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626714629
-SHA256 (nwg-piotr-nwg-launchers-v0.5.0_GH0.tar.gz) = d3ba3ebfac82600a6ddf9186369123284bb233ac98474ea478917bd3266e9c53
-SIZE (nwg-piotr-nwg-launchers-v0.5.0_GH0.tar.gz) = 52715
+TIMESTAMP = 1631868117
+SHA256 (nwg-piotr-nwg-launchers-v0.6.1_GH0.tar.gz) = cc9c1e91c90a634e501df54e08ea82a8cd131015c84162d425d0dd527a747b92
+SIZE (nwg-piotr-nwg-launchers-v0.6.1_GH0.tar.gz) = 62711
diff --git a/x11/nwg-launchers/pkg-plist b/x11/nwg-launchers/pkg-plist
index f60a25629f1e..af3865f098c8 100644
--- a/x11/nwg-launchers/pkg-plist
+++ b/x11/nwg-launchers/pkg-plist
@@ -1,9 +1,10 @@
 bin/nwgbar
 bin/nwgdmenu
 bin/nwggrid
+bin/nwggrid-server
+%%DATADIR%%/icon-missing.png
+%%LIBRSVG2%%%%DATADIR%%/icon-missing.svg
 %%DATADIR%%/nwgbar/bar.json
-%%DATADIR%%/nwgbar/icon-missing.svg
 %%DATADIR%%/nwgbar/style.css
 %%DATADIR%%/nwgdmenu/style.css
-%%DATADIR%%/nwggrid/icon-missing.svg
 %%DATADIR%%/nwggrid/style.css