diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile
index c2fa254ed217d..bed7e07ab0085 100644
--- a/x11/waybar/Makefile
+++ b/x11/waybar/Makefile
@@ -1,8 +1,11 @@
 PORTNAME=	waybar
-DISTVERSION=	0.9.18
+DISTVERSION=	0.9.19
 CATEGORIES=	x11 wayland
 PKGNAMESUFFIX=	${FLAVOR:N${FLAVORS:[1]}:C/.+/-${FLAVOR}/}
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	1fb2b8efd5a1.patch:-p1 # https://github.com/Alexays/Waybar/pull/2284
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Highly customizable Wayland bar for Sway and wlroots-based compositors
 WWW=		https://github.com/Alexays/Waybar
@@ -145,9 +148,11 @@ post-patch:
 # Temporarily use ConsoleKit2 like sysutils/gnome-settings-daemon
 	@${REINPLACE_CMD} -e 's,/login1,/ConsoleKit/Manager,' \
 		-e 's,login1\([".]\),ConsoleKit\1,g' \
+		${WRKSRC}/src/modules/backlight.cpp \
 		${WRKSRC}/src/modules/gamemode.cpp \
 		${WRKSRC}/src/modules/inhibitor.cpp \
-		${WRKSRC}/src/modules/upower/upower.cpp
+		${WRKSRC}/src/modules/upower/upower.cpp \
+		${WRKSRC}/src/util/prepare_for_sleep.cpp
 # Respect PREFIX for icons
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/src/modules/wlr/taskbar.cpp
diff --git a/x11/waybar/distinfo b/x11/waybar/distinfo
index 215ddc0f3034e..025cb044cd92e 100644
--- a/x11/waybar/distinfo
+++ b/x11/waybar/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1685345101
-SHA256 (Alexays-Waybar-0.9.18_GH0.tar.gz) = 44927f71834196276cfcbf5607339f59b511edf0ecc496c09d4f5f115108df3e
-SIZE (Alexays-Waybar-0.9.18_GH0.tar.gz) = 241307
+TIMESTAMP = 1688504630
+SHA256 (Alexays-Waybar-0.9.19_GH0.tar.gz) = 09695c9d6ae4cf33d8e8a2c3e4ba216e5d293e2d72d4115c64c5d2612976816d
+SIZE (Alexays-Waybar-0.9.19_GH0.tar.gz) = 249917
+SHA256 (1fb2b8efd5a1.patch) = 98bd3b424d673f154782bd9c795428a01cba7bf8c8a1a2c46167b5a541024c8b
+SIZE (1fb2b8efd5a1.patch) = 2236