diff --git a/srcpkgs/iscan-plugin-gt-s650/template b/srcpkgs/iscan-plugin-gt-s650/template
index 8ce52051650..1acac6f3047 100644
--- a/srcpkgs/iscan-plugin-gt-s650/template
+++ b/srcpkgs/iscan-plugin-gt-s650/template
@@ -1,29 +1,27 @@
 # Template file for 'iscan-plugin-gt-s650'
 pkgname=iscan-plugin-gt-s650
 version=1.1.0
-revision=2
+revision=3
 repository=nonfree
-build_style=fetch
 maintainer="Dominik Honnef <dominik@honnef.co>"
 depends="sane-epkowa"
 license="AVASYS"
 homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 short_desc="Epson scanner plugin for GT-S650, Epson Perfection V19 and Epson Perfection V39"
-_url="https://download3.ebz.epson.net/dsc/f/03/00/03/51/35/"
+_bundle_version=1.0.0
 if [ "$XBPS_MACHINE" = "x86_64" ]; then
-	_arch=amd64
-	_hash=2bb85852bb07d419fa09653e76027ab61a7e0a95
-	checksum=442ca971cc0ebf71598047f41cb7e36eca0649eb62e324b91091360a63043df4
+	_arch=x64
+	checksum=d27e55652942f7c6e5f7f1b09296b742751c872e3963f8167e1f66fe360d9226
 else
-	_arch=i386
-	_hash=99e341645ab8b18de2acee4eb9a79c3cca4262e2
-	checksum=453004dcf8d6bf68feb1994acd14dbf3f774d49215013568eef6037e8de24643
+	_arch=x86
+	checksum=6f12a5d7b3c1a08a6c5f8762e1cff7ee89063eb73ec723f1822d3fa10c5b50f9
 fi
-distfiles="${_url}/${_hash}/${pkgname}_${version}-2_${_arch}.deb"
+wrksrc="iscan-gt-s650-bundle-${_bundle_version}.${_arch}.deb"
+distfiles="https://download2.ebz.epson.net/iscan/plugin/gt-s650/deb/${_arch}/iscan-gt-s650-bundle-${_bundle_version}.${_arch}.deb.tar.gz"
 only_for_archs="i686 x86_64"
 
 do_install() {
-	ar x *.deb
+	ar x plugins/*.deb
 	tar -xvf data.tar.gz -C ${DESTDIR}
 	vlicense ${DESTDIR}/usr/share/doc/iscan-plugin-gt-s650/AVASYSPL.en.txt
 }
diff --git a/srcpkgs/iscan/template b/srcpkgs/iscan/template
index 4c3dd684de6..f6e8908f560 100644
--- a/srcpkgs/iscan/template
+++ b/srcpkgs/iscan/template
@@ -13,7 +13,7 @@ depends="sane-epkowa"
 license="GPL-2, AVASYSPL"
 homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 short_desc="EPSON Image Scan! front-end"
-distfiles="https://download3.ebz.epson.net/dsc/f/03/00/03/61/59/a3f8b8d60e8702a1c5bf3977d018cc2336e308a8/${pkgname}_${version}-1.tar.gz"
+distfiles="http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${version}-1.tar.gz"
 checksum=79aa9a9f81a7146beb22a382bbaf840fbce61b1bdb82660e541946a471e48426
 only_for_archs="i686 x86_64"