diff --git a/srcpkgs/spotify/INSTALL b/srcpkgs/spotify/INSTALL
index 26606e3422..09c08684de 100644
--- a/srcpkgs/spotify/INSTALL
+++ b/srcpkgs/spotify/INSTALL
@@ -18,7 +18,8 @@ if test "$ACTION" = "post"; then
                 echo "${SCHECKSUM}  spotify-client_${SVERSION}.deb" >checksum
                 sha256sum -c checksum || exit 1
                 ar x "spotify-client_${SVERSION}.deb"
-                tar xf data.tar.xz
+		[ -f data.tar.gz ] && tar xzf data.tar.gz 2>/dev/null
+		[ -f data.tar.xz ] && tar xJf data.tar.xz 2>/dev/null
         ) || {
                 echo Error while extracting;
                 rm -r "$_BUILDDIR";
@@ -26,7 +27,8 @@ if test "$ACTION" = "post"; then
         }
 	mkdir -p /usr/share/licenses/spotify
 	mv "${_BUILDDIR}/usr/share/doc/spotify-client/copyright" /usr/share/licenses/spotify/
-	mv "${_BUILDDIR}/opt/spotify/spotify-client" /usr/share/spotify/spotify-client
+
+	mv -f "${_BUILDDIR}/opt/spotify/spotify-client" /usr/share/spotify/spotify-client
 	for _s in 16 22 24 32 48 64 128 256 512; do
 		mkdir -p "/usr/share/icons/hicolor/${_s}x${_s}/apps"
 		ln -sf "/usr/share/spotify/spotify-client/Icons/spotify-linux-${_s}.png" "/usr/share/icons/hicolor/${_s}x${_s}/apps/spotify-client.png"
diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index 394463056f..7f8320fd20 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,7 +1,7 @@
 # Template build file for 'spotify'.
 pkgname=spotify
 version=0.9
-revision=6
+revision=7
 short_desc="Proprietary music streaming client"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 homepage="https://www.spotify.com"