diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile
index db5b07e2dcdb..c2fa254ed217 100644
--- a/x11/waybar/Makefile
+++ b/x11/waybar/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	waybar
-DISTVERSION=	0.9.17
-PORTREVISION=	4
+DISTVERSION=	0.9.18
 CATEGORIES=	x11 wayland
 PKGNAMESUFFIX=	${FLAVOR:N${FLAVORS:[1]}:C/.+/-${FLAVOR}/}
 
@@ -44,12 +43,16 @@ CONFIGURE_ENV+=	PKG_CONFIG_PATH="${WRKDIR}"
 SUB_FILES+=	date.pc
 .endif
 
-OPTIONS_DEFINE=	DBUS EVDEV GLS ICONSFONT JACK MANPAGES MPD MPRIS PULSEAUDIO SNDIO UDEV UPOWER
-OPTIONS_DEFAULT=DBUS EVDEV GLS ICONSFONT JACK MANPAGES MPD MPRIS PULSEAUDIO SNDIO UDEV UPOWER
+OPTIONS_DEFINE=		CAVA DBUS EVDEV GLS ICONSFONT JACK MANPAGES MPD MPRIS PULSEAUDIO SNDIO UDEV UPOWER
+OPTIONS_DEFAULT=	CAVA DBUS EVDEV GLS ICONSFONT JACK MANPAGES MPD MPRIS PULSEAUDIO SNDIO UDEV UPOWER
+OPTIONS_EXCLUDE+=	CAVA # https://github.com/karlstav/cava/issues/487
 .if ${FLAVOR:U:M*nopulse}
-OPTIONS_EXCLUDE=PULSEAUDIO
+OPTIONS_EXCLUDE+=	PULSEAUDIO
 .endif
 
+CAVA_LIB_DEPENDS=	libcava.so:audio/cava
+CAVA_MESON_ENABLED=	cava
+
 DBUS_LIB_DEPENDS=	libdbusmenu-gtk3.so:devel/libdbusmenu
 DBUS_MESON_ENABLED=	dbusmenu-gtk
 
@@ -79,8 +82,10 @@ MANPAGES_PLIST_FILES=	man/man5/${PORTNAME}-backlight.5.gz \
 			man/man5/${PORTNAME}-cpu.5.gz \
 			man/man5/${PORTNAME}-custom.5.gz \
 			man/man5/${PORTNAME}-disk.5.gz \
+			man/man5/${PORTNAME}-dwl-tags.5.gz \
 			man/man5/${PORTNAME}-gamemode.5.gz \
 			man/man5/${PORTNAME}-idle-inhibitor.5.gz \
+			man/man5/${PORTNAME}-image.5.gz \
 			man/man5/${PORTNAME}-inhibitor.5.gz \
 			man/man5/${PORTNAME}-keyboard-state.5.gz \
 			man/man5/${PORTNAME}-memory.5.gz \
@@ -88,6 +93,7 @@ MANPAGES_PLIST_FILES=	man/man5/${PORTNAME}-backlight.5.gz \
 			man/man5/${PORTNAME}-mpris.5.gz \
 			man/man5/${PORTNAME}-network.5.gz \
 			man/man5/${PORTNAME}-pulseaudio.5.gz \
+			man/man5/${PORTNAME}-river-layout.5.gz \
 			man/man5/${PORTNAME}-river-mode.5.gz \
 			man/man5/${PORTNAME}-river-tags.5.gz \
 			man/man5/${PORTNAME}-river-window.5.gz \
@@ -101,6 +107,7 @@ MANPAGES_PLIST_FILES=	man/man5/${PORTNAME}-backlight.5.gz \
 			man/man5/${PORTNAME}-temperature.5.gz \
 			man/man5/${PORTNAME}-tray.5.gz \
 			man/man5/${PORTNAME}-upower.5.gz \
+			man/man5/${PORTNAME}-wireplumber.5.gz \
 			man/man5/${PORTNAME}-wlr-taskbar.5.gz \
 			man/man5/${PORTNAME}-wlr-workspaces.5.gz \
 			man/man5/${PORTNAME}.5.gz \
diff --git a/x11/waybar/distinfo b/x11/waybar/distinfo
index 309ca42934fc..215ddc0f3034 100644
--- a/x11/waybar/distinfo
+++ b/x11/waybar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1673433570
-SHA256 (Alexays-Waybar-0.9.17_GH0.tar.gz) = da6f448be343a593ee092486fb4744502aa1e6ad85f4eccc3670d0b84a2a4266
-SIZE (Alexays-Waybar-0.9.17_GH0.tar.gz) = 220836
+TIMESTAMP = 1685345101
+SHA256 (Alexays-Waybar-0.9.18_GH0.tar.gz) = 44927f71834196276cfcbf5607339f59b511edf0ecc496c09d4f5f115108df3e
+SIZE (Alexays-Waybar-0.9.18_GH0.tar.gz) = 241307