diff --git a/srcpkgs/JAI/update b/srcpkgs/JAI/update
new file mode 100644
index 00000000000..42016e16d2f
--- /dev/null
+++ b/srcpkgs/JAI/update
@@ -0,0 +1,3 @@
+version=${version//./_}
+site="http://download.java.net/media/jai/builds/release/"
+pattern='href="\K[\d_]+(?=/")'
diff --git a/srcpkgs/LoginKit/update b/srcpkgs/LoginKit/update
new file mode 100644
index 00000000000..bd8b49f2782
--- /dev/null
+++ b/srcpkgs/LoginKit/update
@@ -0,0 +1,2 @@
+site="https://git.devuan.org/pkgs-utopia-substitution/loginkit/tags"
+pattern='upstream/\K[\d.]+'
diff --git a/srcpkgs/atom/template b/srcpkgs/atom/template
index f43e37704e3..48d6c74c6aa 100644
--- a/srcpkgs/atom/template
+++ b/srcpkgs/atom/template
@@ -10,12 +10,9 @@ short_desc="Chrome-based text editor from Github"
 maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
 license="MIT"
 homepage="https://atom.io"
+distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz"
+checksum="27dadd5b9a63d53e75ff662123960b1ddca6e6dd84073983306b4717854beee0"
 
-do_fetch() {
-	local url="git://github.com/${pkgname}/${pkgname}"
-	msg_normal "Fetching source from $url ...\n"
-	git clone --branch v${version} ${url} ${pkgname}-${version}
-}
 do_build() {
 	script/build
 }
diff --git a/srcpkgs/attica-qt5/update b/srcpkgs/attica-qt5/update
new file mode 100644
index 00000000000..45bccdf8f38
--- /dev/null
+++ b/srcpkgs/attica-qt5/update
@@ -0,0 +1 @@
+pkgname=${pkgname%-*}
diff --git a/srcpkgs/bananapi-uboot/update b/srcpkgs/bananapi-uboot/update
new file mode 100644
index 00000000000..3320146662d
--- /dev/null
+++ b/srcpkgs/bananapi-uboot/update
@@ -0,0 +1,2 @@
+pkgname=bananian
+site="https://github.com/Bananian/u-boot-bananapi/releases"
diff --git a/srcpkgs/beaglebone-uboot/update b/srcpkgs/beaglebone-uboot/update
new file mode 100644
index 00000000000..a4f0ca17b6c
--- /dev/null
+++ b/srcpkgs/beaglebone-uboot/update
@@ -0,0 +1 @@
+pkgname=u-boot
diff --git a/srcpkgs/bitcoin/update b/srcpkgs/bitcoin/update
index 290264346fe..b28ea45c089 100644
--- a/srcpkgs/bitcoin/update
+++ b/srcpkgs/bitcoin/update
@@ -1,2 +1,2 @@
-site="https://bitcoin.org/en/download"
-pattern='bitcoin-\K[\d.]+(?=-linux.tar.gz)'
+site="https://bitcoin.org/bin/"
+pattern='bitcoin-core-\K[\d.]+'
diff --git a/srcpkgs/cgmanager/update b/srcpkgs/cgmanager/update
new file mode 100644
index 00000000000..f3f979eb361
--- /dev/null
+++ b/srcpkgs/cgmanager/update
@@ -0,0 +1 @@
+site="https://linuxcontainers.org/cgmanager/downloads"
diff --git a/srcpkgs/checkbashisms/update b/srcpkgs/checkbashisms/update
new file mode 100644
index 00000000000..d04db19fc71
--- /dev/null
+++ b/srcpkgs/checkbashisms/update
@@ -0,0 +1,2 @@
+site=https://anonscm.debian.org/cgit/collab-maint/devscripts.git/
+pattern="tag/\?id=v\K[\d.]+"
diff --git a/srcpkgs/compton-conf/template b/srcpkgs/compton-conf/template
index 334c9a03f1c..6e833e7421f 100644
--- a/srcpkgs/compton-conf/template
+++ b/srcpkgs/compton-conf/template
@@ -13,5 +13,5 @@ short_desc="LXQT compton compositor UI"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="LGPL-2.1"
 homepage="http://lxqt.org/"
-distfiles="http://lxqt.org/downloads/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
+distfiles="http://downloads.lxqt.org/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
 checksum=f362790ae1a20c7ac65790e411cb792200c2430199186affa70dba3ebb01dedf
diff --git a/srcpkgs/compton-conf/update b/srcpkgs/compton-conf/update
new file mode 100644
index 00000000000..4be7da4a9e8
--- /dev/null
+++ b/srcpkgs/compton-conf/update
@@ -0,0 +1,2 @@
+site="http://downloads.lxqt.org/${pkgname}"
+pattern='href="\K[\d.]+'
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index ca49c1bb70d..e8b82afc08d 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -12,7 +12,7 @@ short_desc="A document-oriented database"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="Apache-2.0"
 homepage="http://couchdb.apache.org/"
-distfiles="http://www.eu.apache.org/dist/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+distfiles="http://www.apache.org/dist/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
 checksum=5a601b173733ce3ed31b654805c793aa907131cd70b06d03825f169aa48c8627
 
 system_accounts="couchdb"
diff --git a/srcpkgs/couchdb/update b/srcpkgs/couchdb/update
new file mode 100644
index 00000000000..bad80599c94
--- /dev/null
+++ b/srcpkgs/couchdb/update
@@ -0,0 +1 @@
+pkgname=apache-$pkgname
diff --git a/srcpkgs/cubieboard2-uboot/update b/srcpkgs/cubieboard2-uboot/update
new file mode 100644
index 00000000000..a4f0ca17b6c
--- /dev/null
+++ b/srcpkgs/cubieboard2-uboot/update
@@ -0,0 +1 @@
+pkgname=u-boot
diff --git a/srcpkgs/daemonize/template b/srcpkgs/daemonize/template
index 647f31f49cf..9ca2738508a 100644
--- a/srcpkgs/daemonize/template
+++ b/srcpkgs/daemonize/template
@@ -3,15 +3,10 @@ pkgname=daemonize
 version=1.7.5
 revision=1
 build_style=gnu-configure
-hostmakedepends="git"
 short_desc="Run a program as a Unix daemon"
 maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
 license="BSD, MIT, Public Domain"
 homepage="http://software.clapper.org/daemonize/daemonize.html"
-
-
-do_fetch() {
-	local url="git://github.com/bmc/daemonize"
-	msg_normal "Fetching source from $url ...\n"
-	git clone --branch release-${version} ${url} ${pkgname}-${version}
-}
+distfiles="https://github.com/bmc/$pkgname/archive/release-$version.tar.gz"
+checksum="616220b8dc5721d93bd45e63b2617dbe07cd10a572da505405d64f640b98a06b"
+wrksrc="$pkgname-release-$version"
diff --git a/srcpkgs/daemonize/update b/srcpkgs/daemonize/update
new file mode 100644
index 00000000000..d3094846993
--- /dev/null
+++ b/srcpkgs/daemonize/update
@@ -0,0 +1 @@
+pkgname=release
diff --git a/srcpkgs/daemontools/update b/srcpkgs/daemontools/update
new file mode 100644
index 00000000000..7f128c43b4a
--- /dev/null
+++ b/srcpkgs/daemontools/update
@@ -0,0 +1 @@
+site=http://cr.yp.to/daemontools/install.html
diff --git a/srcpkgs/fastd/update b/srcpkgs/fastd/update
new file mode 100644
index 00000000000..3bcdef4d6bb
--- /dev/null
+++ b/srcpkgs/fastd/update
@@ -0,0 +1 @@
+site=http://git.universe-factory.net/fastd/refs/
diff --git a/srcpkgs/inkscape/update b/srcpkgs/inkscape/update
index 8758aff9cbe..41f967a52b3 100644
--- a/srcpkgs/inkscape/update
+++ b/srcpkgs/inkscape/update
@@ -1 +1 @@
-ignore="*pre*"
+site="https://inkscape.org/en/download/"
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
new file mode 100644
index 00000000000..c002e80531c
--- /dev/null
+++ b/srcpkgs/kodi-rpi/update
@@ -0,0 +1 @@
+pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"