diff --git a/recipes-extended/libdbusmenu/libdbusmenu_16.04.0.bb b/recipes-extended/libdbusmenu/libdbusmenu_16.04.0.bb
deleted file mode 100644
index 4dfce38..0000000
--- a/recipes-extended/libdbusmenu/libdbusmenu_16.04.0.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "Ayatana dbus indicator helper library"
-LICENSE = "GPL-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
-DEPENDS = "intltool-native glib-2.0-native json-glib dbus gtk+3"
-
-SRC_URI = "https://launchpad.net/libdbusmenu/16.04/16.04.0/+download/libdbusmenu-${PV}.tar.gz"
-
-SRC_URI[sha256sum] = "b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a"
-
-inherit autotools pkgconfig gobject-introspection features_check
-
-DEPENDS_append_class-target = " gobject-introspection-native qemu-native"
-
-REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
-
-# this requires gtk+2
-EXTRA_OECONF += "--disable-dumper"
-
-# dont treat warnings as errors
-CFLAGS_append += "-Wno-error"
-
-do_compile_prepend() {
-	export GIR_EXTRA_LIBS_PATH="${B}/libdbusmenu-glib/.libs:${B}/libdbusmenu-gtk/.libs"
-}
-
diff --git a/recipes-support/spdlog/spdlog_%.bbappend b/recipes-support/spdlog/spdlog_%.bbappend
new file mode 100644
index 0000000..3f3af41
--- /dev/null
+++ b/recipes-support/spdlog/spdlog_%.bbappend
@@ -0,0 +1,3 @@
+PV = "1.8.5"
+SRCREV = "v${PV}"
+
diff --git a/recipes-support/waybar/waybar_git.bb b/recipes-support/waybar/waybar_git.bb
index ebc2392..6e13ce9 100644
--- a/recipes-support/waybar/waybar_git.bb
+++ b/recipes-support/waybar/waybar_git.bb
@@ -19,6 +19,7 @@ DEPENDS += " \
 	spdlog \
 	gtk+3 \
 	gobject-introspection \
+	spdlog \
 	wayland \
 	wayland-native \
 	wayland-protocols \
@@ -32,8 +33,6 @@ PACKAGECONFIG[mpd] = ",,libmpdclient"
 PACKAGECONFIG[network] = ",,libnl"
 PACKAGECONFIG[sysvinit] = ",,eudev"
 PACKAGECONFIG[systemd] = ",,systemd"
-# this would rdepend on a bunch of libindicator recipes we dont provide
-PACKAGECONFIG[tray] = ",,libdbusmenu"
 
 PACKAGECONFIG ?= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth', d)} \
@@ -52,8 +51,8 @@ RRECOMMENDS_${PN} += " \
 SRC_URI = "git://github.com/Alexays/Waybar.git;protocol=https"
 
 S = "${WORKDIR}/git"
-PV = "0.9.7"
-SRCREV = "${PV}"
+PV = "0.9.7+${SRCREV}"
+SRCREV = "36857ae72b267fdcf4d2f993d3fe1e84066de754"
 
 inherit meson pkgconfig features_check