diff --git a/recipes-streaming/spotifyd/spotifyd.bb b/recipes-streaming/spotify/spotifyd.bb
similarity index 95%
rename from recipes-streaming/spotifyd/spotifyd.bb
rename to recipes-streaming/spotify/spotifyd.bb
index ce403ca..641b563 100644
--- a/recipes-streaming/spotifyd/spotifyd.bb
+++ b/recipes-streaming/spotify/spotifyd.bb
@@ -8,21 +8,36 @@ python() {
         raise bb.parse.SkipRecipe('Requires meta-rust to be present.')
 }
 
-DEPENDS = "alsa-lib openssl"
+DEPENDS = " \
+    alsa-lib \
+    libogg \
+    openssl \
+    dbus \
+"
 
 inherit cargo
 
-SRC_URI += "git://github.com/Spotifyd/spotifyd.git"
+SRC_URI = "git://github.com/Spotifyd/spotifyd.git"
 SRCREV = "133a1199f80c7c22f29a45226db3bb856b106a5b"
 S = "${WORKDIR}/git"
 # crate ruins SRCPV so set PV manually
 PV = "0.2.24+git133a1199"
 
-# Hmm - no change
-#PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd pulseaudio', d)}"
-#PACKAGECONFIG[systemd] = ",,systemd"
-#PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
+# No unconditional start on each boot
+#do_install_append() {
+#    install -d ${D}${systemd_user_unitdir}
+#    install -m 644 ${S}/contrib/spotifyd.service ${D}${systemd_user_unitdir}
+#}
 
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}"
+PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
+PACKAGECONFIG[portaudio] = ",,portaudio"
+
+CARGO_BUILD_FLAGS += "--features dbus_mpris,dbus_keyring,alsa_backend${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', ',pulseaudio_backend', '', d)}${@bb.utils.contains('PACKAGECONFIG', 'portaudio', ',portaudio_backend', '', d)}"
+
+FILES_${PN} += "${systemd_user_unitdir}"
+
+############################################################################
 # The following parts were auto-generated by cargo-bitbake - have no idea
 CARGO_SRC_DIR = ""