diff --git a/srcpkgs/spotify/INSTALL b/srcpkgs/spotify/INSTALL
index 7450d4a6821..069d9ef6c8d 100644
--- a/srcpkgs/spotify/INSTALL
+++ b/srcpkgs/spotify/INSTALL
@@ -6,7 +6,7 @@ _LIBS=$(ldconfig -vNX -n /usr/lib 2>/dev/null)
 
 linklib() {
 	_LIB=$(echo "$_LIBS" | grep -m 1 "${1}\.so" | sed 's/\s*\([^ ]*\).*$/\1/')
-	ln -sf "/usr/lib/${_LIB}" "/usr/share/spotify/libs/${1}.so.${2}"
+	ln -sf "/usr/lib/${_LIB}" "/usr/share/spotify/${1}.so.${2}"
 }
 
 if test "$ACTION" = "post"; then
@@ -15,7 +15,7 @@ if test "$ACTION" = "post"; then
 	(
 		set -e
 		cd "$_BUILDDIR"
-		xbps-uhelper fetch "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${SVERSION}.deb"
+		xbps-uhelper fetch "http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${SVERSION}.deb"
 		echo "${SCHECKSUM}  spotify-client_${SVERSION}.deb" >checksum
 		sha256sum -c checksum
 		ar x "spotify-client_${SVERSION}.deb"
@@ -26,33 +26,17 @@ if test "$ACTION" = "post"; then
 		rm -r "$_BUILDDIR";
 		exit 1;
 	fi
-	mkdir -p /usr/share/licenses/spotify
-	mv "${_BUILDDIR}/usr/share/doc/spotify-client/copyright" /usr/share/licenses/spotify/
 
 	[ -d "/usr/share/spotify/spotify-client" ] && rm -rf /usr/share/spotify/spotify-client
-	mv -f "${_BUILDDIR}/opt/spotify/spotify-client" /usr/share/spotify/spotify-client
+	mv -f "${_BUILDDIR}/usr/share/spotify" /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"
+		ln -sf "/usr/share/spotify/spotify-client/icons/spotify-linux-${_s}.png" "/usr/share/icons/hicolor/${_s}x${_s}/apps/spotify-client.png"
 	done
 	mkdir -p /usr/share/applications
 	ln -sf /usr/share/spotify/spotify-client/spotify.desktop /usr/share/applications/spotify.desktop
-
-	if test "$ARCH" = "x86_64"; then
-		linklib "libssl" "1.0.0"
-		linklib "libcrypto" "1.0.0"
-		linklib "libudev" "0"
-	else
-		linklib "libssl" "0.9.8"
-		linklib "libcrypto" "0.9.8"
-		linklib "libnss3" "1d"
-		linklib "libnssutil3" "1d"
-		linklib "libsmime3" "1d"
-		linklib "libplc4" "0d"
-		linklib "libnspr4" "0d"
-		linklib "libudev" "0"
-	fi
-
+	linklib "libssl" "1.0.0"
+	linklib "libcrypto" "1.0.0"
 	rm -r "$_BUILDDIR"
 fi
 
diff --git a/srcpkgs/spotify/REMOVE b/srcpkgs/spotify/REMOVE
index 941cc4667a6..e8a6922521c 100644
--- a/srcpkgs/spotify/REMOVE
+++ b/srcpkgs/spotify/REMOVE
@@ -2,7 +2,6 @@
 # Deleting dynamically fetched files
 
 if test "$ACTION" = "post"; then
-	rm -r /usr/share/licenses/spotify
 	rm /usr/share/applications/spotify.desktop
 	for _s in 16 22 24 32 48 64 128 256 512; do
 		rm "/usr/share/icons/hicolor/${_s}x${_s}/apps/spotify-client.png"
diff --git a/srcpkgs/spotify/files/spotify b/srcpkgs/spotify/files/spotify
index 524fe5c9b42..35f912475d1 100644
--- a/srcpkgs/spotify/files/spotify
+++ b/srcpkgs/spotify/files/spotify
@@ -1,2 +1,2 @@
 #!/bin/sh
-LD_LIBRARY_PATH=/usr/share/spotify/libs exec /usr/share/spotify/spotify-client/spotify "$@"
+LD_LIBRARY_PATH=/usr/share/spotify exec /usr/share/spotify/spotify-client/spotify "$@"
diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index 76368004ce3..2acbd95febe 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,7 +1,8 @@
 # Template build file for 'spotify'.
 pkgname=spotify
-version=0.9
-revision=10
+version=1.0.19
+revision=1
+_sversion=".106.gb8a7150f"
 short_desc="Proprietary music streaming client"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 homepage="https://www.spotify.com"
@@ -10,42 +11,19 @@ create_wrksrc=1
 only_for_archs="x86_64 i686"
 repository=nonfree
 build_style=fetch
-makedepends="libgpg-error-devel"
-distfiles="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.4.tar.bz2"
-checksum="d5f88d9f41a46953dc250cdb8575129b37ee2208401b7fa338c897f667c7fb33
- "
-depends="binutils qt gtk+ nss GConf libXScrnSaver xz"
+depends="binutils gtk+ nss GConf libXScrnSaver xz"
 
 if test "${XBPS_TARGET_MACHINE}" = "x86_64"; then
-	_sversion=".17.1.g9b85d43.7-1_amd64"
-	_schecksum="717a878bcfa495852d19ac34bb4b0fa1b2f063ab94547defd32725d1dec10775"
-	distfiles+=" http://seblu.net/a/archive/packages/g/gtk2/gtk2-2.24.24-1-x86_64.pkg.tar.xz"
-	checksum+=" 53a7a400050d5c16585fa19f587da9639f05970fd703dc4c6482f9ceb6ccbaee"
-	depends+=" pango-xft"
+	_sversion+="_amd64"
+	_schecksum="be6b99329bb2fccdc9d77bc949dd463576fdb40db7f56195b4284bd348c470be"
 else
-	_sversion=".4.183.g644e24e.428-1_i386"
-	_schecksum="ca45d057357e4c30efee3838dd941222500463ddd0a1db6981e4d48d7ad986f2"
-	distfiles+=" http://seblu.net/a/archive/packages/g/gtk2/gtk2-2.24.24-1-i686.pkg.tar.xz"
-	checksum+=" 8d9be115cfe6fb2b26d4ecc837a1aa498cd7492395106e5085d08f6a15862209"
+	_sversion+="_i386"
+	_schecksum="128b5d04dda8a052802fb9e664a996250569696fac359e94ea35043472f5dbcb"
 fi
 
-do_extract() {
-	tar xjf "${XBPS_SRCDISTDIR}/spotify-${version}/libgcrypt-1.5.4.tar.bz2"
-	tar xJf "${XBPS_SRCDISTDIR}/spotify-${version}/gtk2-2.24.24-1-${XBPS_TARGET_MACHINE}.pkg.tar.xz"
-}
-
-do_build() {
-	cd libgcrypt-1.5.4
-	./configure ${configure_args}
-	make ${makejobs}
-}
-
 do_install() {
 	vbin ${FILESDIR}/spotify
-	vmkdir usr/share/spotify/libs
-	vinstall libgcrypt-1.5.4/src/.libs/libgcrypt.so.11.8.3 755 usr/share/spotify/libs libgcrypt.so.11
-	vinstall usr/lib/libgdk-x11-2.0.so.0.2400.24 755 usr/share/spotify/libs libgdk-x11-2.0.so.0
-	vinstall usr/lib/libgtk-x11-2.0.so.0.2400.24 755 usr/share/spotify/libs libgtk-x11-2.0.so.0
+	vmkdir usr/share/spotify
 	echo "export SVERSION=\"${version}${_sversion}\"" >"${DESTDIR}/usr/share/spotify/pkgdata"
 	echo "export SCHECKSUM=\"${_schecksum}\"" >>"${DESTDIR}/usr/share/spotify/pkgdata"
 }
diff --git a/srcpkgs/spotify/update b/srcpkgs/spotify/update
index 50604f8c5cc..04fea02f21f 100644
--- a/srcpkgs/spotify/update
+++ b/srcpkgs/spotify/update
@@ -1,4 +1,4 @@
-site="http://repository.spotify.com/pool/non-free/s/spotify/"
+site="http://repository.spotify.com/pool/non-free/s/spotify-client/"
 version="${version}${_sversion}"
 pattern='>spotify-client_\K.+(?=\.deb<)'