diff --git a/media-sound/spotify/files/spotify-wrapper b/media-sound/spotify/files/spotify-wrapper
index 1909df6ae199c..d84a9c129c44d 100644
--- a/media-sound/spotify/files/spotify-wrapper
+++ b/media-sound/spotify/files/spotify-wrapper
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export LD_LIBRARY_PATH="/usr/$LIBDIR/apulse"
+export LD_LIBRARY_PATH="/usr/lib64/apulse"
 
 if command -v spotify-dbus.py > /dev/null; then
         echo "Launching spotify with Gnome systray integration."
@@ -10,7 +10,10 @@ else
         busline="org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.OpenUri ${1}"
         echo "Spotify is already running"
         echo "Sending ${busline} to dbus"
-        if command -v qdbus &> /dev/null; then
+        if command -v qdbus6 &> /dev/null; then
+            qdbus6 $busline
+            exit
+        elif command -v qdbus &> /dev/null; then
             qdbus $busline
             exit
         fi
@@ -22,6 +25,6 @@ else
     else
         echo "Neither gnome-integration-spotify nor spotify-tray are installed."
         echo "Launching spotify without systray integration."
-        exec "$SPOTIFY_HOME/spotify" --no-zygote "$@"
+        exec "/opt/spotify/spotify-client/spotify" --no-zygote "$@"
     fi
 fi
diff --git a/media-sound/spotify/spotify-1.2.63.ebuild b/media-sound/spotify/spotify-1.2.63-r1.ebuild
similarity index 100%
rename from media-sound/spotify/spotify-1.2.63.ebuild
rename to media-sound/spotify/spotify-1.2.63-r1.ebuild