diff --git a/x11/wapanel/Makefile b/x11/wapanel/Makefile
index 53d95271046a..f2c19c377815 100644
--- a/x11/wapanel/Makefile
+++ b/x11/wapanel/Makefile
@@ -1,41 +1,39 @@
 PORTNAME=	wapanel
 DISTVERSION=	1.1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Desktop bar for Wayfire and other wlroots compositors
 WWW=		https://firstbober.github.io/wapanel/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 DEPRECATED=	https://github.com/Firstbober/wapanel/issues/39
 
 BUILD_DEPENDS=	toml11>0:devel/toml11 \
 		wayland-protocols>0:graphics/wayland-protocols
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 		libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
 
 USES=		compiler:c++17-lang gnome meson pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	gdkpixbuf2 gtk30
 GH_ACCOUNT=	Firstbober
 MESON_ARGS=	-Dsystem_toml11=true
 
 OPTIONS_DEFINE=	PULSEAUDIO
 OPTIONS_DEFAULT=PULSEAUDIO
 OPTIONS_SUB=	yes
 
-PULSEAUDIO_SUBPACKAGES=	pulseaudio
-LIB_DEPENDS.pulseaudio=	libpulse.so:audio/pulseaudio
-SELF_DEPENDS.pulseaudio=main
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_MESON_TRUE=	volume-control
 
 post-patch:
 # Respect PREFIX for *.desktop
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/src/applets/task-switcher/task_switcher.cc \
 		${WRKSRC}/thirdparty/xdgpp/xdg.hpp
 
 .include <bsd.port.mk>
diff --git a/x11/wapanel/pkg-descr.pulseaudio b/x11/wapanel/pkg-descr.pulseaudio
deleted file mode 100644
index 37fe3ddd4b26..000000000000
--- a/x11/wapanel/pkg-descr.pulseaudio
+++ /dev/null
@@ -1,10 +0,0 @@
-Simple panel/status bar/task bar for your custom stacking
-Wayland-based desktop.
-
-Features:
-- Good configurability
-- Config hot reload
-- Exposed API for writing custom applets
-- Custom themes with CSS
-
-This package provides PulseAudio-based volume applet.
diff --git a/x11/wapanel/pkg-message b/x11/wapanel/pkg-message
deleted file mode 100644
index bd57b6bf6b1d..000000000000
--- a/x11/wapanel/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: upgrade
-  maximum_version: "1.1.0_4"
-  message: <<EOD
-Applets with extra dependencies moved into subpackages:
-- wapanel-pulseaudio
-EOD
-}
-]
diff --git a/x11/wapanel/pkg-plist b/x11/wapanel/pkg-plist
index 7541c3c79123..e3057e9ef4da 100644
--- a/x11/wapanel/pkg-plist
+++ b/x11/wapanel/pkg-plist
@@ -1,17 +1,17 @@
 bin/wapanel
 include/wapanel-appletapi/appletapi.h
 lib/libwapanel-appletapi.a
 lib/wapanel/applets/libwapanel-applet-activator.so
 lib/wapanel/applets/libwapanel-applet-app-finder.so
 lib/wapanel/applets/libwapanel-applet-clock.so
 lib/wapanel/applets/libwapanel-applet-separator.so
 lib/wapanel/applets/libwapanel-applet-task-switcher.so
-%%PULSEAUDIO%%@@pulseaudio@@lib/wapanel/applets/libwapanel-applet-volume-control.so
+%%PULSEAUDIO%%lib/wapanel/applets/libwapanel-applet-volume-control.so
 libdata/pkgconfig/wapanel-appletapi.pc
 %%DATADIR%%/3RD_PARTY_LICENSES
 %%DATADIR%%/icons/hicolor/scalable/actions/wapa-account.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/wapa-cog.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/wapa-folder.svg
 %%DATADIR%%/icons/hicolor/scalable/apps/wapa-logo-nocolor-dark.svg
 %%DATADIR%%/wapanel.css
 %%DATADIR%%/wapanel.toml