diff --git a/srcpkgs/skype/files/skype.sh b/srcpkgs/skype/files/skype.sh
deleted file mode 100644
index 39dfe846ff4..00000000000
--- a/srcpkgs/skype/files/skype.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-MACHINE=$(uname -m)
-if [ "$MACHINE" = "x86_64" ]; then
-	export LD_LIBRARY_PATH=/usr/lib32
-	export QT_PLUGIN_PATH=/usr/lib32/qt/plugins
-fi
-
-PULSE_LATENCY_MSEC=30 exec /usr/lib32/skype/skype "$@"
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 95e78054882..10b35e6bd61 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,46 +1,39 @@
 # Template file for 'skype'
+# This just repackages the debian package.
 pkgname=skype
-version=4.3.0.37
-revision=5
-short_desc="P2P software for high-quality voice communication"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
-homepage="http://www.skype.com"
-license="skype"
-distfiles="http://download.skype.com/linux/${pkgname}-${version}.tar.bz2"
-checksum=8c99dc3978a588fb13303df7c8134379fb55b8dd460efefbc79ae594269b892d
-
-only_for_archs="i686"
+version=5.3.0.1
+revision=1
+only_for_archs="x86_64"
 repository="nonfree"
+build_style="fetch"
 nostrip="yes"
-depends="pulseaudio qt hicolor-icon-theme ca-certificates alsa-plugins-pulseaudio pavucontrol qt-webkit"
-lib32mode="full"
+short_desc="Skype for Linux Beta"
+maintainer="Lon Willett <xgit@lonw.net>"
+license="skype"
+homepage="https://www.skype.com"
+distfiles="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
+checksum=3fdb61292cfdeef42ddb473d019884a4a8c5798f871793086f5edb6fb14d4e23
+
+do_extract() {
+	ar p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/skypeforlinux_${version}_amd64.deb data.tar.xz | tar xJpf - ./usr
+}
 
 do_install() {
-	# Executable
-	vbin ${FILESDIR}/skype.sh skype
-	vinstall skype 755 usr/lib/skype
-	
-	# Data
-	vmkdir usr/share/skype
-	vcopy avatars usr/share/skype
-	vcopy lang usr/share/skype
-	vcopy sounds usr/share/skype
-	
-	# DBus Service
-	vinstall skype.conf 644 etc/dbus-1/system.d
-	
-	# Icons
-	for _i in 16 32 48; do
-		vmkdir usr/share/icons/hicolor/${_i}x${_i}
-		vcopy icons/SkypeBlue_${_i}x${_i}.png \
-			usr/share/icons/hicolor/${_i}x${_i}/skype.png
+
+	vbin usr/bin/skypeforlinux
+
+	vmkdir usr/share
+	vcopy usr/share/skypeforlinux usr/share
+
+	vlicense usr/share/doc/skypeforlinux/copyright
+	vlicense usr/share/doc/skypeforlinux/third-party_attributions.html
+	# The binary needs to be able to find these under /usr/share/doc
+	vmkdir usr/share/doc/skypeforlinux
+	ln -s ../../licenses/skype/copyright ../../licenses/skype/third-party_attributions.html ${DESTDIR}/usr/share/doc/skypeforlinux
+
+	vinstall usr/share/applications/skypeforlinux.desktop 644 usr/share/applications
+	vinstall usr/share/pixmaps/skypeforlinux.png 644 usr/share/pixmaps
+	find usr/share/icons -type f -print | while read _f; do
+		vinstall "${_f}" 644 "${_f%/*}"
 	done
-	vinstall icons/SkypeBlue_48x48.png 644 usr/share/pixmaps skype.png
-	
-	# Desktop file
-	vinstall skype.desktop 644 usr/share/applications
-	      
-	# License
-	vlicense LICENSE
-	vlicense third-party_attributions.txt
 }