diff --git a/main/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD
index 4fc06818f4ae88e565c3e8c818a1d760da4d5815..5fc69cd108638d447e709341cb0e414cbc7a3b90 100644
--- a/main/acf-alpine-baselayout/APKBUILD
+++ b/main/acf-alpine-baselayout/APKBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-alpine-baselayout
 pkgver=0.7.3
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for alpine-baselayout"
 url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout"
-arch="x86 x86_64"
+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"
diff --git a/main/acf-alpine-conf/APKBUILD b/main/acf-alpine-conf/APKBUILD
index a43d9b31a191881f0eaac392d682103f6d9b60d0..a53f9c1a9a98e1335a1829a6e6960990eaaf014b 100644
--- a/main/acf-alpine-conf/APKBUILD
+++ b/main/acf-alpine-conf/APKBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-alpine-conf
 pkgver=0.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for alpine-conf"
 url="http://git.alpinelinux.org/cgit/acf-alpine-conf"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua lua-posix"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
diff --git a/main/acf-amavisd-new/APKBUILD b/main/acf-amavisd-new/APKBUILD
index 1d9925f5ed652b188f86f066ba52ec80d7b131ba..a985d1089aa24e28615a427fa93ca40542aa402f 100644
--- a/main/acf-amavisd-new/APKBUILD
+++ b/main/acf-amavisd-new/APKBUILD
@@ -1,10 +1,11 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-amavisd-new
 pkgver=0.1.0
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF module for amavis"
 url="http://git.alpinelinux.org/cgit/acf-amavisd-new"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua amavisd-new"
 makedepends=""
diff --git a/main/acf-apk-tools/APKBUILD b/main/acf-apk-tools/APKBUILD
index c03a15758964013670161d2ffa64d41679e3dcb7..1386e41db64dcf2a007af98e41a2a8a87c870c74 100644
--- a/main/acf-apk-tools/APKBUILD
+++ b/main/acf-apk-tools/APKBUILD
@@ -1,10 +1,11 @@
-# Contributor: Mika Havela <mika.havela@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-apk-tools
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF module for apk"
 url="http://git.alpinelinux.org/cgit/acf-apk-tools"
-arch="x86 x86_64"
+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"
diff --git a/main/acf-asterisk/APKBUILD b/main/acf-asterisk/APKBUILD
index c844f45281e830ad00a4220f907b5233e432004a..423cffa0523cc313933d8d6c32161ab40bc5d749 100644
--- a/main/acf-asterisk/APKBUILD
+++ b/main/acf-asterisk/APKBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-asterisk
 pkgver=0.2.3
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for asterisk"
 url="http://git.alpinelinux.org/cgit/acf-asterisk"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua asterisk"
 makedepends=""
diff --git a/main/acf-chrony/APKBUILD b/main/acf-chrony/APKBUILD
index 309c2e26d8fea119639bbda1b9d0b0dad0d2cd6f..8ae9ffae78a748bbd501d1006f057337c386c334 100644
--- a/main/acf-chrony/APKBUILD
+++ b/main/acf-chrony/APKBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-chrony
 pkgver=0.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for chrony"
 url="http://git.alpinelinux.org/cgit/acf-chrony"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua lua-posix chrony"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
diff --git a/main/acf-clamav/APKBUILD b/main/acf-clamav/APKBUILD
index 6937c29dc734a3be2b1c940fb8987974046815e4..4fba07067b5b9b01428f5957f1d625553f0acee0 100644
--- a/main/acf-clamav/APKBUILD
+++ b/main/acf-clamav/APKBUILD
@@ -1,10 +1,11 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-clamav
 pkgver=0.2.4
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for clamav"
 url="http://git.alpinelinux.org/cgit/acf-clamav"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua clamav"
 makedepends=""
diff --git a/main/acf-clamsmtp/APKBUILD b/main/acf-clamsmtp/APKBUILD
index 60bf8f80b066bc3b1743a4cdc98afd3316b01a0f..9c1f4370fc6d73f44c5e9fbd551dcabe105ebeb3 100644
--- a/main/acf-clamsmtp/APKBUILD
+++ b/main/acf-clamsmtp/APKBUILD
@@ -1,10 +1,11 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-clamsmtp
 pkgver=0.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for clamsmtp"
 url="http://git.alpinelinux.org/cgit/acf-clamsmtp"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua clamsmtp"
 makedepends=""
diff --git a/main/acf-core/APKBUILD b/main/acf-core/APKBUILD
index 458b211137255577ba7c4188dd64b3f67ca87987..e57048d08512fef0957988d66cb27ba63f7cffdd 100644
--- a/main/acf-core/APKBUILD
+++ b/main/acf-core/APKBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-core
 pkgver=0.12.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface framework"
 url="http://git.alpinelinux.org/cgit/acf-core"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 install="$pkgname.post-upgrade"
 depends="acf-jquery acf-lib acf-skins haserl lua lua-posix lua-md5"
diff --git a/main/acf-dansguardian/APKBUILD b/main/acf-dansguardian/APKBUILD
index eee4b1e559bb3a7efb62a5506bcf8bc232187e5f..3c8da56f7454aec2e3d47cb3f2a36a2b70749d05 100644
--- a/main/acf-dansguardian/APKBUILD
+++ b/main/acf-dansguardian/APKBUILD
@@ -1,10 +1,11 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dansguardian
 pkgver=0.3.3
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for dansguardian"
 url="http://git.alpinelinux.org/cgit/acf-dansguardian"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua dansguardian"
 makedepends=""
diff --git a/main/acf-dhcp/APKBUILD b/main/acf-dhcp/APKBUILD
index 6dcc599b197a7e0c2129c7d5ccf1a1bf6767c5d0..0b7c643e2e780027b8eda5fa6aac87457c1f359f 100644
--- a/main/acf-dhcp/APKBUILD
+++ b/main/acf-dhcp/APKBUILD
@@ -1,10 +1,11 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dhcp
 pkgver=0.4.3
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for dhcp"
 url="http://git.alpinelinux.org/cgit/acf-dhcp"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua dhcp"
 makedepends=""
diff --git a/main/acf-dnscache/APKBUILD b/main/acf-dnscache/APKBUILD
index b2b2c609b0964a27394ec832934500dda075d5c7..ac4f8a4261839dde1bbcd021200b05db93cc0f90 100644
--- a/main/acf-dnscache/APKBUILD
+++ b/main/acf-dnscache/APKBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dnscache
 pkgver=0.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for dnscache"
 url="http://git.alpinelinux.org/cgit/acf-dnscache"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua lua-posix dnscache"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
diff --git a/main/acf-dnsmasq/APKBUILD b/main/acf-dnsmasq/APKBUILD
index 61585cd15dc84a7d9c981c2c503cdd9d620b8798..95d52a366848c71339c436cd416ce483ece1f9c1 100644
--- a/main/acf-dnsmasq/APKBUILD
+++ b/main/acf-dnsmasq/APKBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dnsmasq
 pkgver=0.2.2
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for dnsmasq"
 url="http://git.alpinelinux.org/cgit/acf-dnsmasq"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua dnsmasq"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
diff --git a/main/acf-dovecot/APKBUILD b/main/acf-dovecot/APKBUILD
index 7c785b08b32b79c24ef4e9787695681ac11e515b..2bb03693e0ef5d1f9a51c7902850685aaa5781f3 100644
--- a/main/acf-dovecot/APKBUILD
+++ b/main/acf-dovecot/APKBUILD
@@ -1,10 +1,11 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dovecot
 pkgver=0.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for dovecot"
 url="http://git.alpinelinux.org/cgit/acf-dovecot"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua dovecot"
 makedepends=""
diff --git a/main/acf-fetchmail/APKBUILD b/main/acf-fetchmail/APKBUILD
index ac4f563cd9ac6caec2e5ec3fb2162e881e37f7e5..a8b2beb5334203de7b9ef6b03650235c9b52f689 100644
--- a/main/acf-fetchmail/APKBUILD
+++ b/main/acf-fetchmail/APKBUILD
@@ -1,10 +1,11 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-fetchmail
 pkgver=0.4.2
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for fetchmail"
 url="http://git.alpinelinux.org/cgit/acf-fetchmail"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua fetchmail"
 makedepends=""
diff --git a/main/acf-freeswitch-vmail/APKBUILD b/main/acf-freeswitch-vmail/APKBUILD
index e5c18f40a2c6432dc81138ecccc99745ff3fe500..8b15dadf35e80ec7bb0a817b4157a3bc58e97596 100644
--- a/main/acf-freeswitch-vmail/APKBUILD
+++ b/main/acf-freeswitch-vmail/APKBUILD
@@ -2,10 +2,10 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-freeswitch-vmail
 pkgver=0.0.9
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF for a web interface for freeswitch voicemail"
 url="http://git.alpinelinux.org/cgit/$pkgname"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua lua-sql-sqlite3 freeswitch"
 makedepends=""
diff --git a/main/acf-freeswitch/APKBUILD b/main/acf-freeswitch/APKBUILD
index f7e0bbbd91acb5080ce1f001f9a86346e1a1b310..221b6d7b657372e0d448fcf2513239b54488ebc8 100644
--- a/main/acf-freeswitch/APKBUILD
+++ b/main/acf-freeswitch/APKBUILD
@@ -1,10 +1,11 @@
+# Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-freeswitch
 pkgver=0.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF for freeswitch"
 url="http://git.alpinelinux.org/cgit/acf-freeswitch"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua freeswitch"
 makedepends=""
diff --git a/main/acf-gross/APKBUILD b/main/acf-gross/APKBUILD
index 5336c29fcb7014a79afce913c47e9c7b7c6365aa..b8c7d044239b0110785959bd964e64ca9a60fb57 100644
--- a/main/acf-gross/APKBUILD
+++ b/main/acf-gross/APKBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-gross
 pkgver=0.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for gross"
 url="http://git.alpinelinux.org/cgit/acf-gross"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua gross"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
diff --git a/main/acf-heimdal/APKBUILD b/main/acf-heimdal/APKBUILD
index 0cbbee42456e2505847471500b4472fa1033d062..90b398b2cf0fb31612c49d8b11e688708d949321 100644
--- a/main/acf-heimdal/APKBUILD
+++ b/main/acf-heimdal/APKBUILD
@@ -1,10 +1,11 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-heimdal
 pkgver=0.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF module for heimdal"
 url="http://git.alpinelinux.org/cgit/$pkgname"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua heimdal"
 makedepends=""
diff --git a/main/acf-iproute2-qos/APKBUILD b/main/acf-iproute2-qos/APKBUILD
index 2e6fde73badce0c5aa7bc3c2b3ad4e88d296857b..0d3684cae82da3ae7c305eec52a76a990d964c56 100644
--- a/main/acf-iproute2-qos/APKBUILD
+++ b/main/acf-iproute2-qos/APKBUILD
@@ -1,10 +1,11 @@
-# Contributor: Mika Havela <mika.havela@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-iproute2-qos
 pkgver=0.1.2
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF module for iproute2-qos"
 url="http://git.alpinelinux.org/cgit/$pkgname"
-arch="x86 x86_64"
+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"
diff --git a/main/acf-ipsec-tools/APKBUILD b/main/acf-ipsec-tools/APKBUILD
index 10533eaa249764fa0f605de10ac1bf299212377c..67963748cb10d30beb260f7f0fbf50b60b729e9e 100644
--- a/main/acf-ipsec-tools/APKBUILD
+++ b/main/acf-ipsec-tools/APKBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-ipsec-tools
 pkgver=0.6.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for ipsec-tools"
 url="http://git.alpinelinux.org/cgit/acf-ipsec-tools"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua ipsec-tools"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
diff --git a/main/acf-iptables/APKBUILD b/main/acf-iptables/APKBUILD
index e397f68a06ecc233c0e43c27530c533958fa2f97..a8be8c84126b874a9c47fbf5e7ada2beeeb74210 100644
--- a/main/acf-iptables/APKBUILD
+++ b/main/acf-iptables/APKBUILD
@@ -1,10 +1,11 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-iptables
 pkgver=0.3.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for iptables"
 url="http://git.alpinelinux.org/cgit/acf-iptables"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua iptables"
 makedepends=""
diff --git a/main/acf-jquery/APKBUILD b/main/acf-jquery/APKBUILD
index e13281efac76fcc8e9d0ece7b38cb0f55d99bcaa..19fcf4e47a42959d9b1e3809ddff343aaeda7cdc 100644
--- a/main/acf-jquery/APKBUILD
+++ b/main/acf-jquery/APKBUILD
@@ -1,11 +1,11 @@
+# Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
-# Developer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-jquery
 pkgver=0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="jquery libraries for ACF"
 url="http://git.alpinelinux.org/cgit/acf-jquery"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends=""
 replaces="acf-core"
diff --git a/main/acf-kamailio/APKBUILD b/main/acf-kamailio/APKBUILD
index afcaf237bfe07d762fc2162a6e30b0d0db2a0046..4614034abaddf6c0bfb9cc86f359600826958beb 100644
--- a/main/acf-kamailio/APKBUILD
+++ b/main/acf-kamailio/APKBUILD
@@ -1,10 +1,11 @@
+# Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-kamailio
 pkgver=0.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for kamailio"
 url="http://git.alpinelinux.org/cgit/acf-kamailio"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua kamailio"
 makedepends=""
diff --git a/main/acf-lib/APKBUILD b/main/acf-lib/APKBUILD
index cec4ec8d078df52d78c51b8ed50d4dee507b97b5..0b40f6e789050130a8e03278fb7b9720e11b85e2 100644
--- a/main/acf-lib/APKBUILD
+++ b/main/acf-lib/APKBUILD
@@ -1,11 +1,11 @@
+# Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
-# Developer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-lib
 pkgver=0.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Lua libraries for ACF"
 url="http://git.alpinelinux.org/cgit/acf-lib"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends=""
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
diff --git a/main/acf-lvm2/APKBUILD b/main/acf-lvm2/APKBUILD
index 7e53c1b761daaf4ff0345ff85ad6aa3da6c44f83..ab8dce63d37eeef8ec9c3e7c948a775494bb570d 100644
--- a/main/acf-lvm2/APKBUILD
+++ b/main/acf-lvm2/APKBUILD
@@ -2,10 +2,10 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-lvm2
 pkgver=0.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF module for lvm2"
 url="http://git.alpinelinux.org/cgit/$pkgname"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua lvm2"
 makedepends=""
diff --git a/main/acf-mdadm/APKBUILD b/main/acf-mdadm/APKBUILD
index 541438b7069c17859a7b4fec6ff1cf7a76b81d81..91e28f55871ff35deea4ed4dfde75a087bb9b666 100644
--- a/main/acf-mdadm/APKBUILD
+++ b/main/acf-mdadm/APKBUILD
@@ -2,10 +2,10 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-mdadm
 pkgver=0.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF module for mdadm"
 url="http://git.alpinelinux.org/cgit/$pkgname"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua mdadm"
 makedepends=""
diff --git a/main/acf-opennhrp/APKBUILD b/main/acf-opennhrp/APKBUILD
index c50ee98eb538c8aa26a94b89f2785e3b592eebdf..0f877f648c3de69b4f5d27ac334c779c12a81073 100644
--- a/main/acf-opennhrp/APKBUILD
+++ b/main/acf-opennhrp/APKBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-opennhrp
 pkgver=0.6.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for opennhrp"
 url="http://git.alpinelinux.org/cgit/acf-opennhrp"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua lua-posix opennhrp"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
diff --git a/main/acf-openntpd/APKBUILD b/main/acf-openntpd/APKBUILD
index 7e804fd4d5cacbf09a771d33769df6e03ccf6608..451d408c8a77a5f6ff38b4661a0375109b155d53 100644
--- a/main/acf-openntpd/APKBUILD
+++ b/main/acf-openntpd/APKBUILD
@@ -1,10 +1,11 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openntpd
 pkgver=0.4.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for openntpd"
 url="http://git.alpinelinux.org/cgit/acf-openntpd"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua openntpd"
 makedepends=""
diff --git a/main/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD
index 7a3991642ea0c178c31eac4792a03cfb87345d22..f120238d72633c73fc81e61263bed86de31d2947 100644
--- a/main/acf-openssh/APKBUILD
+++ b/main/acf-openssh/APKBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openssh
 pkgver=0.4.2
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for openssh"
 url="http://git.alpinelinux.org/cgit/acf-openssh"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua openssh"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
diff --git a/main/acf-openssl/APKBUILD b/main/acf-openssl/APKBUILD
index 138615ca464d06a922518d1ef8a419c80b795bfc..e118c7e378c6697452e9bc97aaab5b11f10a6347 100644
--- a/main/acf-openssl/APKBUILD
+++ b/main/acf-openssl/APKBUILD
@@ -1,10 +1,11 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openssl
 pkgver=0.3.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for openssl"
 url="http://git.alpinelinux.org/cgit/acf-openssl"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua openssl"
 makedepends=""
diff --git a/main/acf-openvpn/APKBUILD b/main/acf-openvpn/APKBUILD
index de29cb4b8b61df320de6a3aae34e5e9ee04cf355..dc3a541765e52779e67a2dde3faaed10b0260448 100644
--- a/main/acf-openvpn/APKBUILD
+++ b/main/acf-openvpn/APKBUILD
@@ -1,10 +1,11 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openvpn
 pkgver=0.6.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for openvpn"
 url="http://git.alpinelinux.org/cgit/acf-openvpn"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua openvpn"
 makedepends=""
diff --git a/main/acf-pingu/APKBUILD b/main/acf-pingu/APKBUILD
index eb71cbabe901b852302a74739756f948f09563f0..ed009a323e8fbf03276e14e6569f3f03e6bcb5d1 100644
--- a/main/acf-pingu/APKBUILD
+++ b/main/acf-pingu/APKBUILD
@@ -1,11 +1,11 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-pingu
 pkgver=0.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for pingu"
 url="http://git.alpinelinux.org/cgit/acf-pingu"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua pingu"
 makedepends=""
diff --git a/main/acf-postfix/APKBUILD b/main/acf-postfix/APKBUILD
index f3ee15ea05163592e9eea7a784e3c9d8f827db10..e22753f9b36837646f7a81350a4cad8c132d0dd4 100644
--- a/main/acf-postfix/APKBUILD
+++ b/main/acf-postfix/APKBUILD
@@ -1,11 +1,11 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-postfix
 pkgver=0.3.2
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for postfix"
 url="http://git.alpinelinux.org/cgit/acf-postfix"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua postfix"
 makedepends=""
diff --git a/main/acf-postgresql/APKBUILD b/main/acf-postgresql/APKBUILD
index 4895739244e3a8059aaea3fdceeade21dd390d59..e6250cabaa4272b24f1703a5851fca133cc6d0f9 100644
--- a/main/acf-postgresql/APKBUILD
+++ b/main/acf-postgresql/APKBUILD
@@ -2,10 +2,10 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-postgresql
 pkgver=0.3.2
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF module for postgresql"
 url="http://git.alpinelinux.org/cgit/$pkgname"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua postgresql"
 makedepends=""
diff --git a/main/acf-ppp/APKBUILD b/main/acf-ppp/APKBUILD
index dcaa7fde1df6b71f88055e0fb184a48422b55b22..f1b8507092b47277c2acbde666de904120fe00c5 100644
--- a/main/acf-ppp/APKBUILD
+++ b/main/acf-ppp/APKBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-ppp
 pkgver=0.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for ppp"
 url="http://git.alpinelinux.org/cgit/acf-ppp"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua ppp"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
diff --git a/main/acf-provisioning/APKBUILD b/main/acf-provisioning/APKBUILD
index 7b35a5f313ad2b331f306e5b256a475cd3e11514..7b739539e9732bb657a0665ba2e0b476d4da7afb 100644
--- a/main/acf-provisioning/APKBUILD
+++ b/main/acf-provisioning/APKBUILD
@@ -2,10 +2,10 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-provisioning
 pkgver=0.0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF for provisioning templated configs to devices"
 url="http://git.alpinelinux.org/cgit/acf-provisioning"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua lua-sql-postgres postgresql-client"
 makedepends=""
diff --git a/main/acf-quagga/APKBUILD b/main/acf-quagga/APKBUILD
index 92706b05710fa9ac766216ab9c7a4c56de1bfe1d..0c51aa115253b050b12d4f648038ebe53291143c 100644
--- a/main/acf-quagga/APKBUILD
+++ b/main/acf-quagga/APKBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-quagga
 pkgver=0.5.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for quagga"
 url="http://git.alpinelinux.org/cgit/acf-quagga"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua quagga"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
diff --git a/main/acf-samba/APKBUILD b/main/acf-samba/APKBUILD
index 3b841404186da2a8eac15d026092994c69992d95..74b3c08559984700a8d80e055bf1bb0a6e9758d1 100644
--- a/main/acf-samba/APKBUILD
+++ b/main/acf-samba/APKBUILD
@@ -1,10 +1,11 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-samba
 pkgver=0.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for samba"
 url="http://git.alpinelinux.org/cgit/acf-samba"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua samba"
 makedepends=""
diff --git a/main/acf-shorewall/APKBUILD b/main/acf-shorewall/APKBUILD
index aa0dee11688d10bfaf012391e4b7368349a6742e..c83a487754912693fa3adb00152babc2c46676c3 100644
--- a/main/acf-shorewall/APKBUILD
+++ b/main/acf-shorewall/APKBUILD
@@ -1,10 +1,11 @@
+# Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-shorewall
 pkgver=0.6.2
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for shorewall"
 url="http://git.alpinelinux.org/cgit/acf-shorewall"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua shorewall"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
diff --git a/main/acf-skins/APKBUILD b/main/acf-skins/APKBUILD
index 76daa0b0fc48186102d978dff473f33c2d71bf2f..5c7604ef77fcb6f4d17b24a981651d68fc2ee50f 100644
--- a/main/acf-skins/APKBUILD
+++ b/main/acf-skins/APKBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-skins
 pkgver=0.3.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Skins for ACF"
 url="http://git.alpinelinux.org/cgit/acf-skins"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends=""
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
diff --git a/main/acf-snort/APKBUILD b/main/acf-snort/APKBUILD
index d37c4eb2995c0deacbdd4f306362005af9bc93e8..bb25c85ce7adb4df8bf3e961753d9b97623ac4ec 100644
--- a/main/acf-snort/APKBUILD
+++ b/main/acf-snort/APKBUILD
@@ -1,10 +1,11 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-snort
 pkgver=0.5.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for snort"
 url="http://git.alpinelinux.org/cgit/acf-snort"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua snort"
 makedepends=""
diff --git a/main/acf-squid/APKBUILD b/main/acf-squid/APKBUILD
index 7060ed32e0ac9a840de37d6ce70d6232eeb70a4a..1d6118ad749d868dd597a7b44529ae672f7f1711 100644
--- a/main/acf-squid/APKBUILD
+++ b/main/acf-squid/APKBUILD
@@ -1,10 +1,11 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-squid
 pkgver=0.6.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for squid"
 url="http://git.alpinelinux.org/cgit/acf-squid"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua squid"
 makedepends=""
diff --git a/main/acf-tcpproxy/APKBUILD b/main/acf-tcpproxy/APKBUILD
index 3241c29f9a02fe7dbcf00e5c2ec8895ce4425f59..994709523390d2cab38c7ed7df00dc63fed448d1 100644
--- a/main/acf-tcpproxy/APKBUILD
+++ b/main/acf-tcpproxy/APKBUILD
@@ -1,10 +1,11 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-tcpproxy
 pkgver=0.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for tcpproxy"
 url="http://git.alpinelinux.org/cgit/acf-tcpproxy"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua tcpproxy"
 makedepends=""
diff --git a/main/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD
index e5e0b89d1344956961c527f543479f0b17460978..a46ad995e02d1c1ce97025e865a85be6bdd3a485 100644
--- a/main/acf-tinydns/APKBUILD
+++ b/main/acf-tinydns/APKBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-tinydns
 pkgver=0.6.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for tinydns"
 url="http://git.alpinelinux.org/cgit/acf-tinydns"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua tinydns"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD
index 9b7da995713fdc7bfb7b56e9606315ca10ab2eec..b1b7b48fb12380c77e5a9de7bf28374954debc2f 100644
--- a/main/acf-weblog/APKBUILD
+++ b/main/acf-weblog/APKBUILD
@@ -2,10 +2,10 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-weblog
 pkgver=0.5.9
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF for web proxy (squid and dansguardian) logfiles"
 url="http://git.alpinelinux.org/cgit/acf-weblog"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua lua-sql-postgres wget postgresql-client"
 makedepends=""
diff --git a/testing/acf-fetch-crl/APKBUILD b/testing/acf-fetch-crl/APKBUILD
index 5b647373244d119893b51c2cb69e440c5a4dd4ce..8e2e23e5aeb1b70eafb966627d4bcd0db4aac6ea 100644
--- a/testing/acf-fetch-crl/APKBUILD
+++ b/testing/acf-fetch-crl/APKBUILD
@@ -1,10 +1,10 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 pkgname=acf-fetch-crl
 pkgver=0.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for fetch-crl"
 url="http://git.alpinelinux.org/cgit/$pkgname"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua fetch-crl"
 makedepends=""