diff --git a/main/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD
index 2852c992af890b2b609e22dc126c4906c069aef4..3a602f8c0b1cfb561eab83dacf6e7d56b4eb45d8 100644
--- a/main/acf-alpine-baselayout/APKBUILD
+++ b/main/acf-alpine-baselayout/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-alpine-baselayout
 pkgver=0.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for alpine-baselayout"
 url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout"
 arch="noarch"
 license="GPL-2"
 depends="acf-core lua lua-json4 lua-posix"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-alpine-conf/APKBUILD b/main/acf-alpine-conf/APKBUILD
index 359d79cf1abef2b4674f54294d98a17ee1cb7b3c..0bea5a5071971326abec9ab77a4301ed6091000d 100644
--- a/main/acf-alpine-conf/APKBUILD
+++ b/main/acf-alpine-conf/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-alpine-conf
 pkgver=0.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A web-based system administration interface for alpine-conf"
 url="http://git.alpinelinux.org/cgit/acf-alpine-conf"
 arch="noarch"
 license="GPL-2"
 depends="acf-core lua lua-posix openssl"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-amavisd-new/APKBUILD b/main/acf-amavisd-new/APKBUILD
index 661c3fc92f8782319b0af2242252a86af51ef104..25c3b33d220fcf26f32d669f2972be43a3670d7d 100644
--- a/main/acf-amavisd-new/APKBUILD
+++ b/main/acf-amavisd-new/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-amavisd-new
 pkgver=0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF module for amavis"
 url="http://git.alpinelinux.org/cgit/acf-amavisd-new"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua amavisd-new"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
         cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-apk-tools/APKBUILD b/main/acf-apk-tools/APKBUILD
index f067708ba0f7bf3327991f4314be264050882bee..c2c18e4d96173f157baf4dc9bfde13813589b9d4 100644
--- a/main/acf-apk-tools/APKBUILD
+++ b/main/acf-apk-tools/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-apk-tools
 pkgver=0.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="ACF module for apk"
 url="http://git.alpinelinux.org/cgit/acf-apk-tools"
 arch="noarch"
 license="GPL-2"
 depends="acf-core lua lua-posix apk-tools"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-asterisk/APKBUILD b/main/acf-asterisk/APKBUILD
index 15681baad968f950b3f55c5ffd93cbfc65b8d114..90fd6172ba5a64ee9372ccd928c9cda008bab772 100644
--- a/main/acf-asterisk/APKBUILD
+++ b/main/acf-asterisk/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-asterisk
 pkgver=0.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for asterisk"
 url="http://git.alpinelinux.org/cgit/acf-asterisk"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua asterisk"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-chrony/APKBUILD b/main/acf-chrony/APKBUILD
index ed96aad5a3f6153380c8eb51256bc1edb65627bc..3d84cd14f517d67ced991e2b5b2069636bf31686 100644
--- a/main/acf-chrony/APKBUILD
+++ b/main/acf-chrony/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-chrony
 pkgver=0.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A web-based system administration interface for chrony"
 url="http://git.alpinelinux.org/cgit/acf-chrony"
 arch="noarch"
 license="GPL-2"
 depends="acf-core lua lua-posix chrony"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-clamav/APKBUILD b/main/acf-clamav/APKBUILD
index ebb218d20a9c8972be0b2401a98679f39c073842..1496e02c8eaa7a8772126b5f191879c7101a5225 100644
--- a/main/acf-clamav/APKBUILD
+++ b/main/acf-clamav/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-clamav
 pkgver=0.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for clamav"
 url="http://git.alpinelinux.org/cgit/acf-clamav"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua clamav"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-clamsmtp/APKBUILD b/main/acf-clamsmtp/APKBUILD
index 2bcee5001b993c2131735ccd4ba6525f4994e8d9..dd8db1fa082c429b55989093f01fd1b522d03a3b 100644
--- a/main/acf-clamsmtp/APKBUILD
+++ b/main/acf-clamsmtp/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-clamsmtp
 pkgver=0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for clamsmtp"
 url="http://git.alpinelinux.org/cgit/acf-clamsmtp"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua clamsmtp"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-core/APKBUILD b/main/acf-core/APKBUILD
index 6086df6e97e85aa1c2b3da1e7ab54adfe6711163..0a73ac388a335d0f183b4566f433dbc8207e3a55 100644
--- a/main/acf-core/APKBUILD
+++ b/main/acf-core/APKBUILD
@@ -2,14 +2,14 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-core
 pkgver=0.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface framework"
 url="http://git.alpinelinux.org/cgit/acf-core"
 arch="noarch"
 license="GPL-2"
 install="$pkgname.post-upgrade"
 depends="acf-jquery acf-lib acf-skins haserl lua lua-posix lua-md5"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-dansguardian/APKBUILD b/main/acf-dansguardian/APKBUILD
index 0c5bd98b5bdca09bef462a130b51066a7fbab85e..4c7aba5157c287c80c4124d7b5b7720d77aacb1e 100644
--- a/main/acf-dansguardian/APKBUILD
+++ b/main/acf-dansguardian/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dansguardian
 pkgver=0.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for dansguardian"
 url="http://git.alpinelinux.org/cgit/acf-dansguardian"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua dansguardian"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-dhcp/APKBUILD b/main/acf-dhcp/APKBUILD
index 48ac6d74c088c8d57cb481baa490a3e9ad9f7308..33039e38c4211cfa964cfffaf719d0a063d9de07 100644
--- a/main/acf-dhcp/APKBUILD
+++ b/main/acf-dhcp/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dhcp
 pkgver=0.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for dhcp"
 url="http://git.alpinelinux.org/cgit/acf-dhcp"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua dhcp"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-dnscache/APKBUILD b/main/acf-dnscache/APKBUILD
index 0a945ef6fe0fc18519d2e259ddff391497e5e7b3..1d2963390bc7ac6086f1ee98e9b342ff71411b37 100644
--- a/main/acf-dnscache/APKBUILD
+++ b/main/acf-dnscache/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dnscache
 pkgver=0.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A web-based system administration interface for dnscache"
 url="http://git.alpinelinux.org/cgit/acf-dnscache"
 arch="noarch"
 license="GPL-2"
 depends="acf-core lua lua-posix dnscache"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-dnsmasq/APKBUILD b/main/acf-dnsmasq/APKBUILD
index b0ee2a75ec6f7179b0d8c81c8d50477f2e958ab0..ec11bc93e01925fe3683fcefef0f9d7fe8a0933d 100644
--- a/main/acf-dnsmasq/APKBUILD
+++ b/main/acf-dnsmasq/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dnsmasq
 pkgver=0.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for dnsmasq"
 url="http://git.alpinelinux.org/cgit/acf-dnsmasq"
 arch="noarch"
 license="GPL-2"
 depends="acf-core lua dnsmasq"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-dovecot/APKBUILD b/main/acf-dovecot/APKBUILD
index 7a2024110fbb77ba710a87f9685a5c8059ed07c5..9947179015bb9b9a5864af9a7bee3b702e3d77dc 100644
--- a/main/acf-dovecot/APKBUILD
+++ b/main/acf-dovecot/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dovecot
 pkgver=0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for dovecot"
 url="http://git.alpinelinux.org/cgit/acf-dovecot"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua dovecot"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-fetchmail/APKBUILD b/main/acf-fetchmail/APKBUILD
index a71a68a9133da3259347ca8b8bf6d11aa06d8ac7..4ff6a4bb6ef7cf9c959ae477c337cd94c9a4d0bb 100644
--- a/main/acf-fetchmail/APKBUILD
+++ b/main/acf-fetchmail/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-fetchmail
 pkgver=0.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for fetchmail"
 url="http://git.alpinelinux.org/cgit/acf-fetchmail"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua fetchmail"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-freeswitch-vmail/APKBUILD b/main/acf-freeswitch-vmail/APKBUILD
index fb1755762b725d42e9aa144823d7adccdcf5bd13..29fc8c0d0b916253e70fe80719257993e5ba722e 100644
--- a/main/acf-freeswitch-vmail/APKBUILD
+++ b/main/acf-freeswitch-vmail/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-freeswitch-vmail
 pkgver=0.0.10
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF for a web interface for freeswitch voicemail"
 url="http://git.alpinelinux.org/cgit/$pkgname"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua lua-sql-sqlite3 freeswitch"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir"/$pkgname-$pkgver
diff --git a/main/acf-freeswitch/APKBUILD b/main/acf-freeswitch/APKBUILD
index fb5398c886b92975145a7d0102d71f9fc66ddde8..dc042fdf2d7db6e8ad4910f1b865a125da2b96ee 100644
--- a/main/acf-freeswitch/APKBUILD
+++ b/main/acf-freeswitch/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-freeswitch
 pkgver=0.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF for freeswitch"
 url="http://git.alpinelinux.org/cgit/acf-freeswitch"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua freeswitch"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-gross/APKBUILD b/main/acf-gross/APKBUILD
index b5ff3e7cfbdb86a219abff8987819742b99b772a..cdb25d9131bc107bb0113c4f83252b97aacb0d8c 100644
--- a/main/acf-gross/APKBUILD
+++ b/main/acf-gross/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-gross
 pkgver=0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for gross"
 url="http://git.alpinelinux.org/cgit/acf-gross"
 arch="noarch"
 license="GPL-2"
 depends="acf-core lua gross"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-heimdal/APKBUILD b/main/acf-heimdal/APKBUILD
index 20db4932cf5a052ae365cabce8c1c643c5828c84..c4caaf9e751425a8612ddf1deb32898136d30814 100644
--- a/main/acf-heimdal/APKBUILD
+++ b/main/acf-heimdal/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-heimdal
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF module for heimdal"
 url="http://git.alpinelinux.org/cgit/$pkgname"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua heimdal"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
         cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-iproute2-qos/APKBUILD b/main/acf-iproute2-qos/APKBUILD
index ca05c42f8077fffb296d3303af421681f0187960..8238b5ceb0114cf283c535c1f4da15887b785234 100644
--- a/main/acf-iproute2-qos/APKBUILD
+++ b/main/acf-iproute2-qos/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-iproute2-qos
 pkgver=0.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF module for iproute2-qos"
 url="http://git.alpinelinux.org/cgit/$pkgname"
 arch="noarch"
 license="GPL-2"
 depends="acf-core lua iproute2-qos acf-alpine-baselayout>=0.5.7"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-ipsec-tools/APKBUILD b/main/acf-ipsec-tools/APKBUILD
index c2cf59c15e38ab94dfbee753e80e03c51c7c471f..be5c707e4cc1de7f8916d223a63e2fff54eca722 100644
--- a/main/acf-ipsec-tools/APKBUILD
+++ b/main/acf-ipsec-tools/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-ipsec-tools
 pkgver=0.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for ipsec-tools"
 url="http://git.alpinelinux.org/cgit/acf-ipsec-tools"
 arch="noarch"
 license="GPL-2"
 depends="acf-core lua ipsec-tools"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-iptables/APKBUILD b/main/acf-iptables/APKBUILD
index cc6fbe0828a0219c3e540a1c19214b07465ea521..66705f8c3cee6f193872d58c2df19c8d5274e9e3 100644
--- a/main/acf-iptables/APKBUILD
+++ b/main/acf-iptables/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-iptables
 pkgver=0.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for iptables"
 url="http://git.alpinelinux.org/cgit/acf-iptables"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua iptables"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-jquery/APKBUILD b/main/acf-jquery/APKBUILD
index a93a23761e78304bf56d8ac9c566e1c9067c9fdc..8b49964b6039633e8ea0e6ac33993820804b4b1c 100644
--- a/main/acf-jquery/APKBUILD
+++ b/main/acf-jquery/APKBUILD
@@ -2,14 +2,14 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-jquery
 pkgver=0.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="jquery libraries for ACF"
 url="http://git.alpinelinux.org/cgit/acf-jquery"
 arch="noarch"
 license="GPL-2"
 depends=""
 replaces="acf-core"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-kamailio/APKBUILD b/main/acf-kamailio/APKBUILD
index 7828b40e8154f969c00951f3310f16a5dd3e496b..b80684495c7926e0f38f8efb8cb0caf92ba769ce 100644
--- a/main/acf-kamailio/APKBUILD
+++ b/main/acf-kamailio/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-kamailio
 pkgver=0.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for kamailio"
 url="http://git.alpinelinux.org/cgit/acf-kamailio"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua kamailio lua-sql-postgres"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-lib/APKBUILD b/main/acf-lib/APKBUILD
index 29f2053cfa1b3183b72ffefa7bb2ed48e2b48b18..b375f4c480b91fa4a82e7726cf248b869adea681 100644
--- a/main/acf-lib/APKBUILD
+++ b/main/acf-lib/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-lib
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Lua libraries for ACF"
 url="http://git.alpinelinux.org/cgit/acf-lib"
 arch="noarch"
 license="GPL-2"
 depends=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-lvm2/APKBUILD b/main/acf-lvm2/APKBUILD
index b0daa1b8a2f0f31d9f1e7cc4632e2f3f93027e64..724fbd62665d419b9ce5f64deb4ca94e5ab115a7 100644
--- a/main/acf-lvm2/APKBUILD
+++ b/main/acf-lvm2/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-lvm2
 pkgver=0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF module for lvm2"
 url="http://git.alpinelinux.org/cgit/$pkgname"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua lvm2"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-mdadm/APKBUILD b/main/acf-mdadm/APKBUILD
index 834baf02431ed4cc161d66bb68a58b683d52341e..6e073db26eaa2468d9e164d5977e2e53618170fd 100644
--- a/main/acf-mdadm/APKBUILD
+++ b/main/acf-mdadm/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-mdadm
 pkgver=0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF module for mdadm"
 url="http://git.alpinelinux.org/cgit/$pkgname"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua mdadm"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-opennhrp/APKBUILD b/main/acf-opennhrp/APKBUILD
index 26ca6f80af1063c61807642620b2f7245f002096..9f126957c0d9489c3839650141537ee248599200 100644
--- a/main/acf-opennhrp/APKBUILD
+++ b/main/acf-opennhrp/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-opennhrp
 pkgver=0.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for opennhrp"
 url="http://git.alpinelinux.org/cgit/acf-opennhrp"
 arch="noarch"
 license="GPL-2"
 depends="acf-core lua lua-posix opennhrp"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-openntpd/APKBUILD b/main/acf-openntpd/APKBUILD
index d98bbb72a9cbef455eaaa27ddd73a66b2a2f2fa8..6d329d048b039c4e7f070944ba5c25cfae688ad5 100644
--- a/main/acf-openntpd/APKBUILD
+++ b/main/acf-openntpd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openntpd
 pkgver=0.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for openntpd"
 url="http://git.alpinelinux.org/cgit/acf-openntpd"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua openntpd"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD
index 36dddd2623905b2bba70b16ce7638adf27ba5c5d..918d18c988d2fa1d1319a0269876974cbbe56701 100644
--- a/main/acf-openssh/APKBUILD
+++ b/main/acf-openssh/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openssh
 pkgver=0.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for openssh"
 url="http://git.alpinelinux.org/cgit/acf-openssh"
 arch="noarch"
 license="GPL-2"
 depends="acf-core lua openssh"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-openssl/APKBUILD b/main/acf-openssl/APKBUILD
index bec7a50e1eee841c7200e14d01ad38b0d49e0b15..bb6083aeb2f3ec0944aac66d97138713f2fd1de7 100644
--- a/main/acf-openssl/APKBUILD
+++ b/main/acf-openssl/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openssl
 pkgver=0.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for openssl"
 url="http://git.alpinelinux.org/cgit/acf-openssl"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua openssl"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-openvpn/APKBUILD b/main/acf-openvpn/APKBUILD
index a855dfd51e7a32cc22c600b90012846c45629e55..fa3f3feb766cb3e42fc67184135be93b5a7d937a 100644
--- a/main/acf-openvpn/APKBUILD
+++ b/main/acf-openvpn/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openvpn
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for openvpn"
 url="http://git.alpinelinux.org/cgit/acf-openvpn"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua openvpn"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-pingu/APKBUILD b/main/acf-pingu/APKBUILD
index cfcfa38149174fbed6d41f848bac49bb92fbd875..e1d445c16c3242b67c55756c0ad3f62dbae2e794 100644
--- a/main/acf-pingu/APKBUILD
+++ b/main/acf-pingu/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-pingu
 pkgver=0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for pingu"
 url="http://git.alpinelinux.org/cgit/acf-pingu"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua pingu"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-postfix/APKBUILD b/main/acf-postfix/APKBUILD
index abb9d40186e6a0d7b3741a7c4b33e1f0ba900d4d..f521975d598dc393e1efff0c863889654b276ce8 100644
--- a/main/acf-postfix/APKBUILD
+++ b/main/acf-postfix/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-postfix
 pkgver=0.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for postfix"
 url="http://git.alpinelinux.org/cgit/acf-postfix"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua postfix"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-postgresql/APKBUILD b/main/acf-postgresql/APKBUILD
index cd447a4e4271b5e04b1513380851802a52aad306..a58b95d99338f09b4db467ede97236ac77530f08 100644
--- a/main/acf-postgresql/APKBUILD
+++ b/main/acf-postgresql/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-postgresql
 pkgver=0.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF module for postgresql"
 url="http://git.alpinelinux.org/cgit/$pkgname"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua postgresql"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-ppp/APKBUILD b/main/acf-ppp/APKBUILD
index ab1f45627f9c6a56a53b247533a38ad8ffd66f93..4b8d570be5f4d028b48d2164ac3402e92631c883 100644
--- a/main/acf-ppp/APKBUILD
+++ b/main/acf-ppp/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-ppp
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for ppp"
 url="http://git.alpinelinux.org/cgit/acf-ppp"
 arch="noarch"
 license="GPL-2"
 depends="acf-core lua ppp"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-provisioning/APKBUILD b/main/acf-provisioning/APKBUILD
index 49383e7755e9ad725fa870a2fe628975e78d795a..494c1fe17fdbb481a729c410500832ac17a174ba 100644
--- a/main/acf-provisioning/APKBUILD
+++ b/main/acf-provisioning/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-provisioning
 pkgver=0.0.4
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF for provisioning templated configs to devices"
 url="http://git.alpinelinux.org/cgit/acf-provisioning"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua lua-sql-postgres postgresql-client"
 makedepends=""
 install=""
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir"/$pkgname-$pkgver
diff --git a/main/acf-quagga/APKBUILD b/main/acf-quagga/APKBUILD
index 4b4615c0d5587ea54f7d9be32bf43ff3cb7ee4f5..1cdb6c10c55fe569f693bd0168138afc5a7216b4 100644
--- a/main/acf-quagga/APKBUILD
+++ b/main/acf-quagga/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-quagga
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for quagga"
 url="http://git.alpinelinux.org/cgit/acf-quagga"
 arch="noarch"
 license="GPL-2"
 depends="acf-core lua quagga"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-samba/APKBUILD b/main/acf-samba/APKBUILD
index 1d49d9e970e78fddb36c6b1560ea568076bbea1a..c7e45058c4ce920ebd7d7e028a24c379022d186d 100644
--- a/main/acf-samba/APKBUILD
+++ b/main/acf-samba/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-samba
 pkgver=0.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for samba"
 url="http://git.alpinelinux.org/cgit/acf-samba"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua samba"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-shorewall/APKBUILD b/main/acf-shorewall/APKBUILD
index 07344ad5107147b33ed0135aa6a1b0f5580ac7be..61f3ea74aa645bd37df1c2077ee7aa82dc35a187 100644
--- a/main/acf-shorewall/APKBUILD
+++ b/main/acf-shorewall/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-shorewall
 pkgver=0.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for shorewall"
 url="http://git.alpinelinux.org/cgit/acf-shorewall"
 arch="noarch"
 license="GPL-2"
 depends="acf-core lua shorewall"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-skins/APKBUILD b/main/acf-skins/APKBUILD
index 03eabb5332da79f943a7529bbe121b01b62d20c8..6b077682eeb5dd0c71f5d33c972507336440d73e 100644
--- a/main/acf-skins/APKBUILD
+++ b/main/acf-skins/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-skins
 pkgver=0.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Skins for ACF"
 url="http://git.alpinelinux.org/cgit/acf-skins"
 arch="noarch"
 license="GPL-2"
 depends=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-snort/APKBUILD b/main/acf-snort/APKBUILD
index 73b0c6d494272041867fcc1ddb7acbe927f82159..a842242ad9c620f8189f91fe462322dc1af4d9a1 100644
--- a/main/acf-snort/APKBUILD
+++ b/main/acf-snort/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-snort
 pkgver=0.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for snort"
 url="http://git.alpinelinux.org/cgit/acf-snort"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua snort"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-squid/APKBUILD b/main/acf-squid/APKBUILD
index 72024349181df89ff4730fc3850ae51478d103ea..e7381a18bc44bc1eec7ef1f85b7783989dc5bbd2 100644
--- a/main/acf-squid/APKBUILD
+++ b/main/acf-squid/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-squid
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for squid"
 url="http://git.alpinelinux.org/cgit/acf-squid"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua squid"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-tcpproxy/APKBUILD b/main/acf-tcpproxy/APKBUILD
index e3af51e749b06008397c738d3ae2aa6b5c11521b..70fc8dbd77b760ffbb630d81bebc2744a4b2bdc2 100644
--- a/main/acf-tcpproxy/APKBUILD
+++ b/main/acf-tcpproxy/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-tcpproxy
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for tcpproxy"
 url="http://git.alpinelinux.org/cgit/acf-tcpproxy"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua tcpproxy"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD
index d69cdf5710ec5694b00e3ac8c153f73af65bcfc5..5df08cc0545fbe429a1d50da8135715b25810db7 100644
--- a/main/acf-tinydns/APKBUILD
+++ b/main/acf-tinydns/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-tinydns
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for tinydns"
 url="http://git.alpinelinux.org/cgit/acf-tinydns"
 arch="noarch"
 license="GPL-2"
 depends="acf-core lua tinydns"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD
index e0a5849536df4a885972da697f56018de40e9f35..d08bd81823f38f493e8ea3f495b25c3eb414d09f 100644
--- a/main/acf-weblog/APKBUILD
+++ b/main/acf-weblog/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-weblog
 pkgver=0.5.9
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF for web proxy (squid and dansguardian) logfiles"
 url="http://git.alpinelinux.org/cgit/acf-weblog"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="acf-core lua lua-sql-postgres wget postgresql-client"
 makedepends=""
 install="$pkgname.post-upgrade"
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir"/$pkgname-$pkgver
diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index 58f6ec062d011821a25c6a8fb3797d985dced10e..382873326e75cc7db63155ad8243a7816ad7e66b 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-baselayout
 pkgver=2.0_rc1
-pkgrel=1
+pkgrel=2
 pkgdesc="Alpine base dir structure and init scripts"
 url=http://git.alpinelinux.org/cgit/alpine-baselayout
 depends=
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2
 	"
 arch="all"
 license=GPL-2
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 21f217ea79a2e87527760f2d3c471f850c56bd16..e80ed9797fe61cc318939a861fc76c3bc6126dbb 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
 pkgver=2.5.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 depends="openrc"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2
 	"
 arch="noarch"
 license="GPL-2"
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 322a660f8add863d9dc07e73c6d662625a01a4f1..b735830757340019c00a3a2754c135e82818bf08 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apk-tools
 pkgver=2.0.7
-pkgrel=5
+pkgrel=6
 pkgdesc="Alpine Package Keeper - package manager for alpine"
 subpackages="$pkgname-static"
 depends=
 makedepends="zlib-dev openssl-dev pkgconfig"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2
 	0001-info-return-error-if-owning-package-was-not-found.patch
 	0001-gunzip-fix-ordering-of-boundary-callbacks.patch
 	0001-db-fix-package-caching.patch
diff --git a/main/bbsuid/APKBUILD b/main/bbsuid/APKBUILD
index 4c017a70c7e76b5e1a686c1e49f8bfbb9868c810..6b2bdc782124d7431a1f86e683b6c1ecfde9c100 100644
--- a/main/bbsuid/APKBUILD
+++ b/main/bbsuid/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bbsuid
 pkgver=0.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Busybox SUID root application wrapper"
 url="http://git.alpinelinux.org/cgit/bbsuid"
 arch="all"
 license="GPL-2"
 depends="busybox"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/lua-openrc/APKBUILD b/main/lua-openrc/APKBUILD
index 71860ece13cd1c7a0ceca6be5fd55f7199cf3ced..98d43a325166b0220007347e475426151b9aff9e 100644
--- a/main/lua-openrc/APKBUILD
+++ b/main/lua-openrc/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: 
 pkgname=lua-openrc
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Lua module for OpenRC"
 url="http://git.alpinelinux.org/cgit/lua-openrc/"
 arch="all"
@@ -11,7 +11,7 @@ depends=lua
 makedepends="lua-dev openrc-dev"
 install=
 subpackages=
-source="http://git.alpinelinux.org/cgit/lua-openrc/snapshot/lua-openrc-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/lua-openrc.git/snapshot/lua-openrc-$pkgver.tar.bz2"
 
 
 _builddir="$srcdir"/$pkgname-$pkgver
diff --git a/main/lua-posix/APKBUILD b/main/lua-posix/APKBUILD
index 21ac5e277520f0b104890dd2b579d7f0dcf4033d..00cf9a4fd31aa189e413bd307288df702e4885d5 100644
--- a/main/lua-posix/APKBUILD
+++ b/main/lua-posix/APKBUILD
@@ -2,14 +2,14 @@
 pkgname=lua-posix
 _name=luaposix
 pkgver=5.1.7
-pkgrel=0
+pkgrel=1
 pkgdesc="POSIX library for Lua"
 url="http://luaforge.net/projects/luaposix/"
 arch="all"
 license="MIT"
 depends="lua"
 makedepends="lua-dev"
-source="http://git.alpinelinux.org/cgit/luaposix/snapshot/luaposix-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/luaposix.git/snapshot/luaposix-$pkgver.tar.bz2"
 replaces="luaposix"
 
 build() {
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index fbaa214c2dc8e186e08b4ff5075b2e111ee8bc10..ea0d99d298d6ba597c9444d439e96e5edc11054d 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkinitfs
 pkgver=2.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Tool to generate initramfs images for Alpine"
 url=http://git.alpinelinux.org/cgit/mkinitfs
 depends="busybox apk-tools>=2.0"
 triggers="$pkgname.trigger:/usr/share/kernel/*"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2
 	eglibc.patch
 	xen-domU.patch
 	"
diff --git a/main/pingu/APKBUILD b/main/pingu/APKBUILD
index 8f0e79dfed720ea75bf7e5759124ed4aecf9a4fe..9101c42776060ecb8c747f584bf0718fc4a63880 100644
--- a/main/pingu/APKBUILD
+++ b/main/pingu/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pingu
 pkgver=0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Small daemon that pings hosts and executes a script when status change"
 url="http://git.alpinelinux.org/cgit/pingu"
 arch="all"
 license="GPL"
 depends=
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2
 	pingu.initd
 	"
 
diff --git a/main/sircbot/APKBUILD b/main/sircbot/APKBUILD
index 949b33659997bbeac34e7b5891d79303ad40c746..95133dd5da8c605351cf6f575c992d064a179bf4 100644
--- a/main/sircbot/APKBUILD
+++ b/main/sircbot/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sircbot
 pkgver=0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Minimalistic IRC bot"
 url="http://git.alpinelinux.org/cgit/sircbot/"
 arch="all"
@@ -12,7 +12,7 @@ depends=
 makedepends="lua-dev"
 install="$pkgname.pre-install"
 subpackages="lua-sircbot:luamod"
-source="http://git.alpinelinux.org/cgit/sircbot/snapshot/sircbot-$pkgver.tar.bz2
+source="http://git.alpinelinux.org/cgit/sircbot.git/snapshot/sircbot-$pkgver.tar.bz2
 	sircbot.initd
 	sircbot.confd
 	"
diff --git a/main/sntpc/APKBUILD b/main/sntpc/APKBUILD
index 91571399ba7647298a26c561bd7ca6f51bae219d..9c561a8984c9134f31396c502363193adac05aeb 100644
--- a/main/sntpc/APKBUILD
+++ b/main/sntpc/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sntpc
 pkgver=0.9
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple NTP client"
 url="http://git.alpinelinux.org/cgit/sntpc"
 arch="all"
 license="GPL-2"
 depends=
-source="http://git.alpinelinux.org/cgit/sntpc/snapshot/sntpc-$pkgver.tar.bz2
+source="http://git.alpinelinux.org/cgit/sntpc.git/snapshot/sntpc-$pkgver.tar.bz2
 	sntpc.initd
 	sntpc.confd
 	"
diff --git a/main/uiconv/APKBUILD b/main/uiconv/APKBUILD
index e65ebe35822135f2c44190c956524f5afc7d8e51..75a7a6c807be1f93982614ef0d08398225e161c8 100644
--- a/main/uiconv/APKBUILD
+++ b/main/uiconv/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=uiconv
 pkgver=0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Micro iconv implementation"
 url="http://git.alpinelinux.org/cgit/uiconv"
 arch="all"
 license="GPL"
 depends=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshots/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshots/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/testing/acf-fetch-crl/APKBUILD b/testing/acf-fetch-crl/APKBUILD
index e15fcc0aef66335d582988be9650a8e986690615..f6f2199fd72f0066896a50db2cb83f24fe7fe194 100644
--- a/testing/acf-fetch-crl/APKBUILD
+++ b/testing/acf-fetch-crl/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 pkgname=acf-fetch-crl
 pkgver=0.2.0
-pkgrel=1
+pkgrel=3
 pkgdesc="A web-based system administration interface for fetch-crl"
 url="http://git.alpinelinux.org/cgit/$pkgname"
 arch="noarch"
@@ -10,7 +10,7 @@ depends="acf-core lua fetch-crl"
 makedepends=""
 install=
 subpackages=""
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/testing/apts/APKBUILD b/testing/apts/APKBUILD
index 21e829f96ebed22c8dc55e6298c711b21a9f21e2..549fa94b571912eeeb228324edfae866597efaf7 100644
--- a/testing/apts/APKBUILD
+++ b/testing/apts/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Jeff Bilyk <jbilyk@gmail.com>
 pkgname=apts
 pkgver=0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="APTS - Alpine Package Testing Suite"
 depends=
 makedepends=
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2
 	"
 url="http://git.alpinelinux.org/cgit/apts/"
 arch="noarch"
diff --git a/testing/lua-augeas/APKBUILD b/testing/lua-augeas/APKBUILD
index cb7ca68e0c6496d26ec35ba10b864025c0cfd5d4..f8748cc6a4740427dfe2b18771c09191c052ac56 100644
--- a/testing/lua-augeas/APKBUILD
+++ b/testing/lua-augeas/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-augeas
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Lua bindings for Augeas"
 url="http://git.alpinelinux.org/cgit/lua-augeas/"
 arch="all"
@@ -10,7 +10,7 @@ depends=
 makedepends="lua-dev pkgconfig augeas-dev"
 install=
 subpackages=
-source="http://git.alpinelinux.org/cgit/lua-augeas/snapshot/lua-augeas-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/lua-augeas.git/snapshot/lua-augeas-$pkgver.tar.bz2"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
diff --git a/testing/squark/APKBUILD b/testing/squark/APKBUILD
index 8763bf4dcc5cc3596f9aba765e62bd15e04c5e24..80f5f7d32df0db0c6561a9faab5389909dc6caa6 100644
--- a/testing/squark/APKBUILD
+++ b/testing/squark/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Timo TerÃs <timo.teras@iki.fi>
 pkgname=squark
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Squark - Squid User Authentication and Rating Kit"
 subpackages=
 depends="haserl lua"
 makedepends="net-snmp-dev cmph-dev lua pkgconfig"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2
 	"
 url="http://git.alpinelinux.org/cgit/squark/"
 arch="all"