diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD
index cb913ba35c60256ef4aba8d3bb81d5b61d3a6116..528b0fa201f2d4bb5b2460bcbd4bb26863957ec8 100644
--- a/community/openjdk7/APKBUILD
+++ b/community/openjdk7/APKBUILD
@@ -57,13 +57,13 @@ _dropsver=$_icedteaver
 _dropsurl=http://icedtea.classpath.org/download/drops/icedtea7/$_dropsver
 
 source="http://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.gz
-	saveas-$_dropsurl/openjdk.tar.bz2/openjdk-$_dropsver.tar.bz2
-	saveas-$_dropsurl/corba.tar.bz2/corba-$_dropsver.tar.bz2
-	saveas-$_dropsurl/jaxp.tar.bz2/jaxp-$_dropsver.tar.bz2
-	saveas-$_dropsurl/jaxws.tar.bz2/jaxws-$_dropsver.tar.bz2
-	saveas-$_dropsurl/jdk.tar.bz2/jdk-$_dropsver.tar.bz2
-	saveas-$_dropsurl/langtools.tar.bz2/langtools-$_dropsver.tar.bz2
-	saveas-$_dropsurl/hotspot.tar.bz2/hotspot-$_dropsver.tar.bz2
+	openjdk-$_dropsver.tar.bz2::$_dropsurl/openjdk.tar.bz2
+	corba-$_dropsver.tar.bz2::$_dropsurl/corba.tar.bz2
+	jaxp-$_dropsver.tar.bz2::$_dropsurl/jaxp.tar.bz2
+	jaxws-$_dropsver.tar.bz2::$_dropsurl/jaxws.tar.bz2
+	jdk-$_dropsver.tar.bz2::$_dropsurl/jdk.tar.bz2
+	langtools-$_dropsver.tar.bz2::$_dropsurl/langtools.tar.bz2
+	hotspot-$_dropsver.tar.bz2::$_dropsurl/hotspot.tar.bz2
 	http://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VER-bin.tar.gz
 	https://github.com/mozilla/rhino/releases/download/Rhino$(echo ${RHINO_VER} | sed s'/\./_/g')_RELEASE/rhino$RHINO_VER.zip
 
diff --git a/community/openjdk8/APKBUILD b/community/openjdk8/APKBUILD
index 4a02d7109938852da685769bc9a9b6f269453ea0..2e43ab5fc87e41c149acc1950c0f7573f3c68dca 100644
--- a/community/openjdk8/APKBUILD
+++ b/community/openjdk8/APKBUILD
@@ -42,14 +42,14 @@ subpackages="$pkgname-jre-lib:jrelib $pkgname-jre $pkgname-jre-base:jrebase
 _dropsurl=http://hg.openjdk.java.net/jdk8u/jdk8u
 _dropsver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
 
-source="saveas-$_dropsurl/archive/${_dropsver}.tar.bz2/jdk8u-$_dropsver.tar.bz2
-	saveas-$_dropsurl/corba/archive/${_dropsver}.tar.bz2/corba-$_dropsver.tar.bz2
-	saveas-$_dropsurl/jaxp/archive/${_dropsver}.tar.bz2/jaxp-$_dropsver.tar.bz2
-	saveas-$_dropsurl/jaxws/archive/${_dropsver}.tar.bz2/jaxws-$_dropsver.tar.bz2
-	saveas-$_dropsurl/jdk/archive/${_dropsver}.tar.bz2/jdk-$_dropsver.tar.bz2
-	saveas-$_dropsurl/langtools/archive/${_dropsver}.tar.bz2/langtools-$_dropsver.tar.bz2
-	saveas-$_dropsurl/nashorn/archive/${_dropsver}.tar.bz2/nashorn-$_dropsver.tar.bz2
-	saveas-$_dropsurl/hotspot/archive/${_dropsver}.tar.bz2/hotspot-$_dropsver.tar.bz2
+source="jdk8u-$_dropsver.tar.bz2::$_dropsurl/archive/${_dropsver}.tar.bz2
+	corba-$_dropsver.tar.bz2::$_dropsurl/corba/archive/${_dropsver}.tar.bz2
+	jaxp-$_dropsver.tar.bz2::$_dropsurl/jaxp/archive/${_dropsver}.tar.bz2
+	jaxws-$_dropsver.tar.bz2::$_dropsurl/jaxws/archive/${_dropsver}.tar.bz2
+	jdk-$_dropsver.tar.bz2::$_dropsurl/jdk/archive/${_dropsver}.tar.bz2
+	langtools-$_dropsver.tar.bz2::$_dropsurl/langtools/archive/${_dropsver}.tar.bz2
+	nashorn-$_dropsver.tar.bz2::$_dropsurl/nashorn/archive/${_dropsver}.tar.bz2
+	hotspot-$_dropsver.tar.bz2::$_dropsurl/hotspot/archive/${_dropsver}.tar.bz2
 
 	icedtea-hotspot-musl.patch
 	icedtea-hotspot-noagent-musl.patch
diff --git a/main/charybdis/APKBUILD b/main/charybdis/APKBUILD
index b332b924e0f06bae0fbe8ef287e60670f30d6a2d..efa592a8141297eb3a27ef1eef940ee63d83d2da 100644
--- a/main/charybdis/APKBUILD
+++ b/main/charybdis/APKBUILD
@@ -13,7 +13,7 @@ depends_dev="bison flex openssl-dev zlib-dev libtool"
 makedepends="$depends_dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc"
-source="saveas-http://www.stack.nl/~jilles/irc/$pkgname-$pkgver.tbz2/$pkgname-$pkgver.tar.bz2
+source="$pkgname-$pkgver.tar.bz2::http://www.stack.nl/~jilles/irc/$pkgname-$pkgver.tbz2
 	fix-ratbox-errors.patch
 	$pkgname.initd
 	$pkgname.confd"
diff --git a/main/cython/APKBUILD b/main/cython/APKBUILD
index c8027027ec564b8bfedcf04e337a328dac9c5533..c7f3a5892f82bd9c84103af3633764c83fb77e43 100644
--- a/main/cython/APKBUILD
+++ b/main/cython/APKBUILD
@@ -11,7 +11,7 @@ depends=""
 depends_dev="python-dev py-pgen"
 makedepends="$depends_dev"
 subpackages="$pkgname-dev"
-source="saveas-https://github.com/cython/cython/archive/$pkgver.tar.gz/$pkgname-$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/cython/cython/archive/$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
diff --git a/main/gdnsd/APKBUILD b/main/gdnsd/APKBUILD
index 42b6bd39b40d02fd6da2ef14ed8d5c17dd8d4ce0..6a189c0652ff5b678214a7c01be974304043ac5d 100644
--- a/main/gdnsd/APKBUILD
+++ b/main/gdnsd/APKBUILD
@@ -12,7 +12,7 @@ depends_dev=""
 makedepends="userspace-rcu-dev libev-dev libcap-dev ragel autoconf automake libtool"
 install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc"
-source="saveas-https://github.com/blblack/gdnsd/archive/v$pkgver.tar.gz/gdnsd-$pkgver.tar.gz
+source="gdnsd-$pkgver.tar.gz::https://github.com/blblack/gdnsd/archive/v$pkgver.tar.gz
 	0001-Fix-ztree_txn_-API-to-work.patch
 	0002-Impelement-loading-of-DJBDNS-zone-files.patch
 	0003-fix-djbdns-text-parsing.patch
diff --git a/main/pianobar/APKBUILD b/main/pianobar/APKBUILD
index cc3e5010dba027079cd59f40e77e9b580ac99a99..3eb2e14b3a842817e36f164d8df939e447bb0d2d 100644
--- a/main/pianobar/APKBUILD
+++ b/main/pianobar/APKBUILD
@@ -12,7 +12,7 @@ depends_dev="ffmpeg-dev libao-dev libgcrypt-dev gnutls-dev json-c-dev"
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-doc"
-source="saveas-https://github.com/PromyLOPh/pianobar/tarball/${pkgver}/pianobar-${pkgver}.tar.gz"
+source="pianobar-${pkgver}.tar.gz::https://github.com/PromyLOPh/pianobar/tarball/${pkgver}"
 
 _builddir="${srcdir}/PromyLOPh-pianobar-5b9e0d9"
 prepare() {
diff --git a/main/pptpd/APKBUILD b/main/pptpd/APKBUILD
index 88c8df6a5c8ce2f4dedfc81e40b1b59e87f50856..f70c15c75bf909f4e9f174b788e3c8449fd04dc6 100644
--- a/main/pptpd/APKBUILD
+++ b/main/pptpd/APKBUILD
@@ -11,7 +11,7 @@ depends=""
 makedepends="ppp-dev"
 install=""
 subpackages="$pkgname-doc"
-source="saveas-http://sourceforge.net/projects/poptop/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz/download/$pkgname-$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::http://sourceforge.net/projects/poptop/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz/download
 	fix_MSG_TRYHARD.patch
 	pptpd.patch
 	pptpd.confd
diff --git a/main/sems/APKBUILD b/main/sems/APKBUILD
index a19ee997940aeb7f3cafad13598b83f0e27e02fe..bcebeacbc52b326a8607eb7c149fc757b28fdaae 100644
--- a/main/sems/APKBUILD
+++ b/main/sems/APKBUILD
@@ -20,7 +20,7 @@ subpackages="$pkgname-doc $pkgname-conf_auth $pkgname-conference
 	$pkgname-webconference $pkgname-voicebox $pkgname-voicemail
 	$pkgname-annrecorder $pkgname-jsonrpc $pkgname-registrar"
 
-source="saveas-https://github.com/sems-server/sems/archive/$pkgver.tar.gz/$pkgname-$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/sems-server/sems/archive/$pkgver.tar.gz
 	sems-0001-Force-to-use-system-wide-GSM-includes.patch
 	sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
 	sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch
diff --git a/main/soxr/APKBUILD b/main/soxr/APKBUILD
index 14fcf73f888d2050185ae433c35a66b074af5c50..dcaebc142285b43cfeef11f2a1a33eea7562f5e6 100644
--- a/main/soxr/APKBUILD
+++ b/main/soxr/APKBUILD
@@ -12,7 +12,7 @@ depends_dev="cmake"
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
-source="saveas-http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver-Source.tar.xz/download/$pkgname-$pkgver.tar.xz"
+source="$pkgname-$pkgver.tar.xz::http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver-Source.tar.xz/download"
 _builddir="$srcdir"/$pkgname-$pkgver-Source
 build() {
 	cd "$_builddir"
diff --git a/main/tlsdate/APKBUILD b/main/tlsdate/APKBUILD
index 24b6ef404d523b552e7eb0d5c1c7c21d44d32400..c377444b89e994da12ba8a1d47514e3f243acfe4 100644
--- a/main/tlsdate/APKBUILD
+++ b/main/tlsdate/APKBUILD
@@ -13,7 +13,7 @@ pkggroups="tlsdate"
 makedepends="autoconf automake libtool openssl-dev linux-headers libevent-dev"
 install=""
 subpackages="$pkgname-doc"
-source="saveas-https://github.com/ioerror/tlsdate/tarball/tlsdate-${pkgver}/tlsdate-${pkgver}.tar.gz
+source="tlsdate-${pkgver}.tar.gz::https://github.com/ioerror/tlsdate/tarball/tlsdate-${pkgver}
 	tlsdate.confd
 	tlsdate.initd
 	tlsdated.confd
diff --git a/testing/beard/APKBUILD b/testing/beard/APKBUILD
index d93768f2b4f411b10539a873507118cf08ac7b46..cc3770026424ecb0d7845fd793908a8679c56f42 100644
--- a/testing/beard/APKBUILD
+++ b/testing/beard/APKBUILD
@@ -12,7 +12,7 @@ depends_dev=""
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-doc"
-source="saveas-https://github.com/ahills/beard/archive/v$pkgver.tar.gz/$pkgname-$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/ahills/beard/archive/v$pkgver.tar.gz"
 
 _builddir="$srcdir/$pkgname-$pkgver"
 
diff --git a/testing/boost-coroutine/APKBUILD b/testing/boost-coroutine/APKBUILD
index 3d670173bfbb00e12068eb0435bade8b462ff7b1..60a0ee3de90d3f2eda2e0e7e2476a3041f3fda07 100644
--- a/testing/boost-coroutine/APKBUILD
+++ b/testing/boost-coroutine/APKBUILD
@@ -10,7 +10,7 @@ license="custom:boost"
 depends=
 depends_dev="boost-dev pth-dev"
 install=""
-source="saveas-http://www.boostpro.com/vault/index.php?action=downloadfile&filename=boost-coroutine-2009-12-01.tar.gz&directory=Concurrent%20Programming/boost-coroutine-2009-12-01.tar.gz
+source="boost-coroutine-2009-12-01.tar.gz::http://www.boostpro.com/vault/index.php?action=downloadfile&filename=boost-coroutine-2009-12-01.tar.gz&directory=Concurrent%20Programming
 	boost-coroutine-pth.patch"
 
 _builddir="${srcdir}/boost-coroutine"
diff --git a/testing/compton/APKBUILD b/testing/compton/APKBUILD
index 2a955ad3f0e9046f74129dfdf08aa775253c8e25..b4f2cc6bf55b6881ae4d6f4fd99de6d0839f9623 100644
--- a/testing/compton/APKBUILD
+++ b/testing/compton/APKBUILD
@@ -13,7 +13,7 @@ depends_dev="libx11-dev libxcomposite-dev libxinerama-dev libxdamage-dev \
 makedepends="$depends_dev asciidoc"
 install=""
 subpackages="$pkgname-doc"
-source="saveas-https://github.com/chjj/$pkgname/archive/v$pkgver.tar.gz/$pkgname-$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/chjj/$pkgname/archive/v$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
diff --git a/testing/corebird/APKBUILD b/testing/corebird/APKBUILD
index 11c782dbf572b20bb14b773015e8414abf404dd3..78c7a29109c755748cc77e9ca042d6eb17a73972 100644
--- a/testing/corebird/APKBUILD
+++ b/testing/corebird/APKBUILD
@@ -13,7 +13,7 @@ makedepends="gtk+3.0-dev rest-dev json-glib-dev sqlite-dev libsoup-dev libgee-de
             vala tiff automake autoconf libtool intltool glib-dev"
 install=""
 subpackages="$pkgname-lang $pkgname-doc"
-source="saveas-https://github.com/baedert/corebird/archive/1.0.tar.gz/${pkgname}-${pkgver}.tar.gz"
+source="${pkgname}-${pkgver}.tar.gz::https://github.com/baedert/corebird/archive/1.0.tar.gz"
 options="libtool"
 
 _builddir=${srcdir}/${pkgname}-${pkgver}
diff --git a/testing/detox/APKBUILD b/testing/detox/APKBUILD
index c49183583b2c70794333741e94918abd7c6ca8df..9e694dafa293f3041b8403790ee233d08529c2bb 100644
--- a/testing/detox/APKBUILD
+++ b/testing/detox/APKBUILD
@@ -12,7 +12,7 @@ depends_dev="flex-dev"
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-doc"
-source="saveas-http://sourceforge.net/projects/detox/files/detox/1.2.0/detox-1.2.0.tar.bz2/download/$pkgname-$pkgver.tar.bz2"
+source="$pkgname-$pkgver.tar.bz2::http://sourceforge.net/projects/detox/files/detox/1.2.0/detox-1.2.0.tar.bz2/download"
 
 _builddir=$srcdir/$pkgname-$pkgver
 build() {
diff --git a/testing/fortune/APKBUILD b/testing/fortune/APKBUILD
index c451e383f3eb3a13f4f0e715a41055b56e64b5f8..c2738d8e0ec953a22e5393789a164b74bf3feae7 100644
--- a/testing/fortune/APKBUILD
+++ b/testing/fortune/APKBUILD
@@ -12,7 +12,7 @@ depends_dev=""
 makedepends="$depends_dev libbsd-dev"
 install=""
 subpackages="$pkgname-doc"
-source="saveas-$url/archive/v$pkgver.tar.gz/$pkgname-$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
 
 _builddir="$srcdir/$pkgname-$pkgver"
 build() {
diff --git a/testing/gdnsd/APKBUILD b/testing/gdnsd/APKBUILD
index b083811d64d6d7529e9898b775eb9199f9038aa8..4d83297bd748735d2f3cb56185fad4327b2c28f3 100644
--- a/testing/gdnsd/APKBUILD
+++ b/testing/gdnsd/APKBUILD
@@ -12,7 +12,7 @@ depends_dev=""
 makedepends="userspace-rcu-dev libev-dev libcap-dev ragel autoconf automake libtool"
 install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc"
-source="saveas-https://github.com/blblack/gdnsd/archive/v$pkgver.tar.gz/gdnsd-$pkgver.tar.gz
+source="gdnsd-$pkgver.tar.gz::https://github.com/blblack/gdnsd/archive/v$pkgver.tar.gz
 	gdnsd.initd"
 
 _builddir="$srcdir"/gdnsd-$pkgver
diff --git a/testing/h2o/APKBUILD b/testing/h2o/APKBUILD
index 313e2afae08fe974ee7d3862a8c35f45529af344..8788fb2f82c5d39bafcc7497b46d4146a71e77bb 100644
--- a/testing/h2o/APKBUILD
+++ b/testing/h2o/APKBUILD
@@ -11,7 +11,7 @@ depends="perl"
 makedepends="cmake wslay-dev openssl-dev libuv-dev libyaml-dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc"
-source="saveas-https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz/$pkgname-$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
 	h2o.conf
 	h2o.initd
 	h2o.logrotate"
diff --git a/testing/imapfilter/APKBUILD b/testing/imapfilter/APKBUILD
index 956bd9a4a3bead282e4847e0779b4a2c44954e09..e6ac1de936a2b29b9926041d22b16fa03bde074c 100644
--- a/testing/imapfilter/APKBUILD
+++ b/testing/imapfilter/APKBUILD
@@ -12,7 +12,7 @@ depends_dev=
 makedepends="$depends_dev lua-dev openssl-dev pcre-dev libc-dev"
 install=
 subpackages="$pkgname-doc"
-source="saveas-https://github.com/lefcha/$pkgname/archive/v${pkgver}.tar.gz/$pkgname-$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/lefcha/$pkgname/archive/v${pkgver}.tar.gz
         io-flush.patch"
 
 
diff --git a/testing/ktsuss/APKBUILD b/testing/ktsuss/APKBUILD
index 899e8db40cd9ef0aed878a258b59582bb5afe088..5aae9e13b1f15df5d4a19e7bc878ba5527835297 100644
--- a/testing/ktsuss/APKBUILD
+++ b/testing/ktsuss/APKBUILD
@@ -12,7 +12,7 @@ depends_dev=""
 makedepends="$depends_dev gtk+2.0-dev bash libtool m4 autoconf automake"
 install=""
 subpackages="$pkgname-doc"
-source="saveas-https://github.com/nomius/$pkgname/archive/$pkgver.tar.gz/${pkgname}-${pkgver}.tar.gz"
+source="${pkgname}-${pkgver}.tar.gz::https://github.com/nomius/$pkgname/archive/$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
diff --git a/testing/opensc/APKBUILD b/testing/opensc/APKBUILD
index 68dd2ea90988b390f987c666c1e5be4affe231b8..c12929907645c581c3fd2fa7eceefa4078f4701c 100644
--- a/testing/opensc/APKBUILD
+++ b/testing/opensc/APKBUILD
@@ -13,7 +13,7 @@ depends_dev="pcsc-lite-dev openssl-dev readline-dev"
 makedepends="$depends_dev automake autoconf m4 gettext libtool"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
-source="saveas-https://github.com/OpenSC/OpenSC/archive/${pkgver}.tar.gz/$_realname-${pkgver}.tar.gz"
+source="$_realname-${pkgver}.tar.gz::https://github.com/OpenSC/OpenSC/archive/${pkgver}.tar.gz"
 
 _builddir="$srcdir/$_realname-$pkgver"
 
diff --git a/testing/py-gnuplot/APKBUILD b/testing/py-gnuplot/APKBUILD
index 6e7c735e216dd05ffe736de0be3b4ce33195f891..5cb552a079e0a788024c6f3f563982e83e0df31f 100644
--- a/testing/py-gnuplot/APKBUILD
+++ b/testing/py-gnuplot/APKBUILD
@@ -13,7 +13,7 @@ depends_dev=""
 makedepends="$depends_dev python-dev"
 install=""
 subpackages=""
-source="saveas-http://prdownloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.gz?download/$_pkgname-$pkgver.tar.gz"
+source="$_pkgname-$pkgver.tar.gz::http://prdownloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.gz?download"
 
 _builddir="$srcdir"/$_pkgname-$pkgver
 prepare() {
diff --git a/testing/py-newt_syrup/APKBUILD b/testing/py-newt_syrup/APKBUILD
index fe2accbdf3c21448308ed5ded88efaf2d703ab2a..4270c8d0a0e1162f61b4d20f16a1aed1c416928e 100644
--- a/testing/py-newt_syrup/APKBUILD
+++ b/testing/py-newt_syrup/APKBUILD
@@ -13,7 +13,7 @@ depends_dev=""
 makedepends="python-dev py-setuptools"
 install=""
 subpackages=""
-source="saveas-https://github.com/mcpierce/newt-syrup/archive/RELEASE-0.2.0.tar.gz/${pkgname}-${pkgver}.tar.gz"
+source="${pkgname}-${pkgver}.tar.gz::https://github.com/mcpierce/newt-syrup/archive/RELEASE-0.2.0.tar.gz"
 
 _builddir="$srcdir"/${_realname}-RELEASE-$pkgver
 
diff --git a/testing/py-pygit2/APKBUILD b/testing/py-pygit2/APKBUILD
index fc15dd045a4e7ba969e4cd218d0b7ebf86573d57..4e225778cff3fa6710eac94ba0932238966a3b20 100644
--- a/testing/py-pygit2/APKBUILD
+++ b/testing/py-pygit2/APKBUILD
@@ -9,7 +9,7 @@ arch=all
 license=GPLv2
 depends=
 makedepends="py-setuptools py-cffi python-dev libgit2-dev"
-source=saveas-https://github.com/libgit2/pygit2/archive/v${pkgver}.tar.gz/pygit2-${pkgver}.tar.gz
+source=pygit2-${pkgver}.tar.gz::https://github.com/libgit2/pygit2/archive/v${pkgver}.tar.gz
 
 _builddir=$srcdir/pygit2-$pkgver
 prepare() {
diff --git a/testing/qpage/APKBUILD b/testing/qpage/APKBUILD
index 63adae631ac11d3227d9fd223915a95135902246..d3b181ef13625cda341333ffcd4634f3fa811712 100644
--- a/testing/qpage/APKBUILD
+++ b/testing/qpage/APKBUILD
@@ -11,7 +11,7 @@ depends=""
 depends_dev=
 makedepends="$depends_dev"
 install="$pkgname.pre-install $pkgname.post-install"
-source="saveas-http://archive.debian.org/debian/pool/non-free/q/$pkgname/"$pkgname"_3.3final.orig.tar.gz/$pkgname-$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::http://archive.debian.org/debian/pool/non-free/q/$pkgname/"$pkgname"_3.3final.orig.tar.gz
 	config.input
 	qpage.initd
 	qpage.patch
diff --git a/testing/rocksdb/APKBUILD b/testing/rocksdb/APKBUILD
index 5037263f55ae37f3509f5b7aa9d085fa4b3db005..1105851e6946674476084092363798087ad701fc 100644
--- a/testing/rocksdb/APKBUILD
+++ b/testing/rocksdb/APKBUILD
@@ -12,7 +12,7 @@ depends_dev="bzip2-dev snappy-dev zlib-dev"
 makedepends="$depends_dev linux-headers"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
-source="saveas-https://github.com/facebook/$pkgname/archive/v$pkgver.tar.gz/$pkgname-$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/facebook/$pkgname/archive/v$pkgver.tar.gz
 	10-support-busybox-install.patch
 	20-skip-glibc-specific-features.patch"
 
diff --git a/testing/sch-cake-grsec/APKBUILD b/testing/sch-cake-grsec/APKBUILD
index 1cf6340e384976bf3d02677b69a6a4862a0905ca..bb9ce337f34664db0ca4d38004a333b4490e3f2b 100644
--- a/testing/sch-cake-grsec/APKBUILD
+++ b/testing/sch-cake-grsec/APKBUILD
@@ -35,7 +35,7 @@ makedepends="linux-${_flavor}-dev=${_kernelver} linux-headers"
 install=
 install_if="linux-$_flavor=$_kernelver $_realname"
 subpackages=
-source="saveas-https://github.com/dtaht/sch_cake/archive/$_gitver.tar.gz/$_realname-$_gitver.tar.gz"
+source="$_realname-$_gitver.tar.gz::https://github.com/dtaht/sch_cake/archive/$_gitver.tar.gz"
 _builddir="$srcdir"/sch_cake-$_gitver
 
 prepare() {
diff --git a/testing/sl/APKBUILD b/testing/sl/APKBUILD
index feb4ed92705b15a1f344570194bd887983574aba..73b7eac50ad37ae2b4e1ccd7da5378e5b274dfc6 100644
--- a/testing/sl/APKBUILD
+++ b/testing/sl/APKBUILD
@@ -12,7 +12,7 @@ depends_dev=""
 makedepends="$depends_dev ncurses-dev"
 install=""
 subpackages=""
-source="saveas-$url/archive/$pkgver.tar.gz/$pkgname-$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
 
 _builddir="$srcdir/$pkgname-$pkgver"
 build() {
diff --git a/testing/spacefm/APKBUILD b/testing/spacefm/APKBUILD
index 6e6c715ace341e4b5aa9e5215783f726dcf6a371..8cd259b69e66ae28afa528bb885ca23010fa3c74 100644
--- a/testing/spacefm/APKBUILD
+++ b/testing/spacefm/APKBUILD
@@ -10,7 +10,7 @@ license="GPL3"
 depends="bash"
 makedepends="intltool gettext-dev gtk+2.0-dev gtk+3.0-dev eudev-dev ffmpegthumbnailer-dev linux-headers"
 subpackages="$pkgname-lang $pkgname-doc $pkgname-gtk3 $pkgname-gtk3-lang:lang3 $pkgname-gtk3-doc:doc3"
-source="saveas-https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz/$pkgname-$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
diff --git a/testing/sqm-scripts/APKBUILD b/testing/sqm-scripts/APKBUILD
index a3e8312de1e03c8903220a00eb3e1516c7f22453..6e87de9c519beebafeddddfc30c9d71069e7dcca 100644
--- a/testing/sqm-scripts/APKBUILD
+++ b/testing/sqm-scripts/APKBUILD
@@ -12,7 +12,7 @@ depends_dev=""
 makedepends="$depends_dev"
 install=""
 subpackages=""
-source="saveas-https://github.com/tohojo/sqm-scripts/archive/v${pkgver}.tar.gz/$pkgname-$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/tohojo/sqm-scripts/archive/v${pkgver}.tar.gz
 	10-Makefile.patch
 	10-function.sh.patch
 	10-defaults.sh.patch"
diff --git a/testing/twemproxy/APKBUILD b/testing/twemproxy/APKBUILD
index 389eebe1c77fe9cb324e278136d0ecc2030b5807..a543278cf561c707acb0b8fe5acfa9fa0c22914a 100644
--- a/testing/twemproxy/APKBUILD
+++ b/testing/twemproxy/APKBUILD
@@ -12,7 +12,7 @@ depends=""
 depends_dev=""
 makedepends="automake autoconf libtool yaml-dev"
 subpackages="$pkgname-doc"
-source="saveas-https://github.com/twitter/twemproxy/archive/v$pkgver.tar.gz/$pkgname-$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/twitter/twemproxy/archive/v$pkgver.tar.gz
 	nutcracker.initd
 	nutcracker.confd
 	use-system-libyaml.patch
diff --git a/testing/webalizer/APKBUILD b/testing/webalizer/APKBUILD
index 8c894bb565bdd851c32f9e70ab95ed56a9d08151..c3d6c7a2a392cb0df1edbe370eec7aaaabb43987 100644
--- a/testing/webalizer/APKBUILD
+++ b/testing/webalizer/APKBUILD
@@ -13,7 +13,7 @@ depends_dev=""
 makedepends="$depends_dev db-dev gd-dev libpng-dev zlib-dev bzip2-dev"
 install=""
 subpackages=""
-source="saveas-ftp://ftp.mrunix.net/pub/webalizer/webalizer-$_pkgver-src.tar.bz2/webalizer-$pkgver.tar.bz2"
+source="webalizer-$pkgver.tar.bz2::ftp://ftp.mrunix.net/pub/webalizer/webalizer-$_pkgver-src.tar.bz2"
 _builddir="$srcdir"/$pkgname-$_pkgver
 build() {
 	cd "$_builddir"
diff --git a/testing/xva-img/APKBUILD b/testing/xva-img/APKBUILD
index c97e9ae818ba38b5ebba7f79e632783c99192ad1..c4671053da8c84b1ad2061645e9c89af824b0be3 100644
--- a/testing/xva-img/APKBUILD
+++ b/testing/xva-img/APKBUILD
@@ -12,7 +12,7 @@ depends_dev="openssl-dev"
 makedepends="$depends_dev cmake"
 install=""
 subpackages=""
-source="saveas-https://github.com/eriklax/xva-img/archive/v${pkgver}.tar.gz/xva-img-${pkgver}.tar.gz"
+source="xva-img-${pkgver}.tar.gz::https://github.com/eriklax/xva-img/archive/v${pkgver}.tar.gz"
 
 _srcroot="${srcdir}/${pkgname}-${pkgver}"
 _builddir="${srcdir}/build"
diff --git a/unmaintained/gtkimageview/APKBUILD b/unmaintained/gtkimageview/APKBUILD
index a6cb929e646e6415c17f78cbbf5796d12d1f30e8..058ec9f531f154f69f27287ade27b6d146b148ab 100644
--- a/unmaintained/gtkimageview/APKBUILD
+++ b/unmaintained/gtkimageview/APKBUILD
@@ -12,7 +12,7 @@ depends_dev="gtk+-dev gdk-pixbuf-dev"
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
-source="saveas-http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/${pkgname}-${pkgver}.tar.gz?format=raw/${pkgname}-${pkgver}.tar.gz"
+source="${pkgname}-${pkgver}.tar.gz::http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/${pkgname}-${pkgver}.tar.gz?format=raw"
 
 _builddir="${srcdir}/${pkgname}-${pkgver}"
 prepare() {