diff --git a/x11/nwg-drawer/Makefile b/x11/nwg-drawer/Makefile
index 27ca767fc414..840244a9531f 100644
--- a/x11/nwg-drawer/Makefile
+++ b/x11/nwg-drawer/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	nwg-drawer
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.6
+DISTVERSION=	0.4.7
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Application drawer for sway and other wlroots compositors
 WWW=		https://github.com/nwg-piotr/nwg-drawer
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		gnome go:modules pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 GH_ACCOUNT=	nwg-piotr
 GH_TUPLE=	allan-simon:go-singleinstance:d0997106ab37:allan_simon_go_singleinstance/vendor/github.com/allan-simon/go-singleinstance \
 		dlasky:gotk3-layershell:b0c42cd8474f:dlasky_gotk3_layershell/vendor/github.com/dlasky/gotk3-layershell \
 		fsnotify:fsnotify:v1.7.0:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		golang:sync:v0.6.0:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:v0.16.0:golang_sys/vendor/golang.org/x/sys \
+		golang:sys:v0.17.0:golang_sys/vendor/golang.org/x/sys \
 		gotk3:gotk3:v0.6.3:gotk3_gotk3/vendor/github.com/gotk3/gotk3 \
 		joshuarubin:go-sway:v1.2.0:joshuarubin_go_sway/vendor/github.com/joshuarubin/go-sway \
 		joshuarubin:lifecycle:v1.1.4:joshuarubin_lifecycle/vendor/github.com/joshuarubin/lifecycle \
 		sirupsen:logrus:v1.9.3:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
 		uber-go:multierr:v1.11.0:uber_go_multierr/vendor/go.uber.org/multierr
 CGO_LDFLAGS+=	-Wl,--as-needed # harfbuzz, freetype2
 PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	desktop-directories img *.css
 
 post-patch:
 # Respect PREFIX for *.desktop
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/main.go \
 		${WRKSRC}/tools.go
 
 post-install:
 # Based on install from WRKSRC/Makefile
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" \
 		${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/x11/nwg-drawer/distinfo b/x11/nwg-drawer/distinfo
index 0c1722dd76a9..0eedef58f1d4 100644
--- a/x11/nwg-drawer/distinfo
+++ b/x11/nwg-drawer/distinfo
@@ -1,23 +1,23 @@
-TIMESTAMP = 1707187214
-SHA256 (nwg-piotr-nwg-drawer-v0.4.6_GH0.tar.gz) = 7ca6a8035dbec228ca1f38f5a2347dabfac1b2724de3c3135646d79c0501d6e6
-SIZE (nwg-piotr-nwg-drawer-v0.4.6_GH0.tar.gz) = 52771
+TIMESTAMP = 1707358337
+SHA256 (nwg-piotr-nwg-drawer-v0.4.7_GH0.tar.gz) = 4463841382061ef4a2d6f7fec8b9a846886edf55885cd6b2337874b5cf904e14
+SIZE (nwg-piotr-nwg-drawer-v0.4.7_GH0.tar.gz) = 52991
 SHA256 (allan-simon-go-singleinstance-d0997106ab37_GH0.tar.gz) = f8cee874873fe9fc1a81e8a7ca83df85c57aa86279c09cb8cba10d5feb7ed295
 SIZE (allan-simon-go-singleinstance-d0997106ab37_GH0.tar.gz) = 2819
 SHA256 (dlasky-gotk3-layershell-b0c42cd8474f_GH0.tar.gz) = 7eed1f818f39e9124b2ef8fcf9df24adae371ce882f192b352be24e0408b3680
 SIZE (dlasky-gotk3-layershell-b0c42cd8474f_GH0.tar.gz) = 2374260
 SHA256 (fsnotify-fsnotify-v1.7.0_GH0.tar.gz) = ca8175ba6bd3d0cc992200c2f44acabec05367575dc0478c5902971fe7453f35
 SIZE (fsnotify-fsnotify-v1.7.0_GH0.tar.gz) = 57502
 SHA256 (golang-sync-v0.6.0_GH0.tar.gz) = 23b8fca95397b2293e64e58d333633051ec942b46318ad8f630318e801658b67
 SIZE (golang-sync-v0.6.0_GH0.tar.gz) = 17605
-SHA256 (golang-sys-v0.16.0_GH0.tar.gz) = 9c17b728aa75f4fc4743c3f5c0dccdc3b7f9ac7c12b3124b666672cc571f657e
-SIZE (golang-sys-v0.16.0_GH0.tar.gz) = 1444155
+SHA256 (golang-sys-v0.17.0_GH0.tar.gz) = ac396e3c66940e34fdd1d422a9628ab2a5118249118f2a36f65082d32e709e7a
+SIZE (golang-sys-v0.17.0_GH0.tar.gz) = 1446309
 SHA256 (gotk3-gotk3-v0.6.3_GH0.tar.gz) = cf233b835b1fdd23afa393d1e7483c44a57ab7729afe3a72e7ae3ded2b27a0c8
 SIZE (gotk3-gotk3-v0.6.3_GH0.tar.gz) = 278230
 SHA256 (joshuarubin-go-sway-v1.2.0_GH0.tar.gz) = 3bd95f49be110b40bc005f3db157c0a8e6ccedb4e0ed48e810368f23030a1833
 SIZE (joshuarubin-go-sway-v1.2.0_GH0.tar.gz) = 12933
 SHA256 (joshuarubin-lifecycle-v1.1.4_GH0.tar.gz) = 512fc4ca6e4f8db0b493f47f3edffed3ce09002267b0ff0d64fa09941d4d249f
 SIZE (joshuarubin-lifecycle-v1.1.4_GH0.tar.gz) = 7542
 SHA256 (sirupsen-logrus-v1.9.3_GH0.tar.gz) = cfa48a647a28c1f12fb6a9b672bc4d88b6407ff05aedcf23ce939d342646acce
 SIZE (sirupsen-logrus-v1.9.3_GH0.tar.gz) = 50320
 SHA256 (uber-go-multierr-v1.11.0_GH0.tar.gz) = 8aa599cf7de733306cf8770f854f8a38e6c819b1ae4296f15e44b1e7c6698f34
 SIZE (uber-go-multierr-v1.11.0_GH0.tar.gz) = 16900
diff --git a/x11/nwg-drawer/files/patch-go.mod b/x11/nwg-drawer/files/patch-go.mod
new file mode 100644
index 000000000000..114bfdbc04e5
--- /dev/null
+++ b/x11/nwg-drawer/files/patch-go.mod
@@ -0,0 +1,14 @@
+Drop after lang/go122 appears (switch to USES=go:1.22,modules)
+
+github.com/nwg-piotr/nwg-drawer: cannot compile Go 1.22 code
+
+--- go.mod.orig	2024-02-08 02:12:17 UTC
++++ go.mod
+@@ -1,6 +1,6 @@ module github.com/nwg-piotr/nwg-drawer
+ module github.com/nwg-piotr/nwg-drawer
+ 
+-go 1.22
++go 1.21
+ 
+ require (
+ 	github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37