diff --git a/core/sysvinit/PKGBUILD b/core/sysvinit/PKGBUILD
deleted file mode 100644
index a4634b3ca..000000000
--- a/core/sysvinit/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Alexander Foremny <alexanderforemny@gmail.com>
-
-pkgname=sysvinit
-pkgver=2.86
-pkgrel=3
-pkgdesc="Linux System V Init"
-arch=(arm)
-license=('GPL')
-groups=('base' 'small-base')
-depends=('shadow' 'util-linux' 'coreutils' 'glibc' 'awk')
-source=(ftp://ftp.cistron.nl/pub/people/miquels/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('7d5d61c026122ab791ac04c8a84db967')
-
-build() {
-  cd $srcdir/sysvinit-$pkgver
-
-  cp src/init.c src/init.c.backup
-  sed 's/\(.*\)\(Sending processes\)\(.*\)/\1\2 started by init\3/' \
-     src/init.c > tmp~
-  mv tmp~ src/init.c
-  mkdir -p $startdir/pkg/bin $startdir/pkg/sbin
-  mkdir -p $startdir/pkg/usr/bin
-  mkdir -p $startdir/pkg/usr/man/man5 $startdir/pkg/usr/man/man8
-  mkdir -p $startdir/pkg/usr/man/man1 $startdir/pkg/usr/include
-  make -C src || return 1
-  make -C src MANDIR=/usr/man ROOT=$startdir/pkg install
-}
-
diff --git a/core/wget/PKGBUILD b/core/wget/PKGBUILD
index ab2b8de1b..207591dd4 100644
--- a/core/wget/PKGBUILD
+++ b/core/wget/PKGBUILD
@@ -16,7 +16,6 @@ md5sums=('69e8a7296c0e12c53bd9ffd786462e87')
 
 build() {
   cd ${srcdir}/wget-$pkgver
-
   ./configure --prefix=/opt --sysconfdir=/opt/etc || return 1
   make || return 1
   make DESTDIR=${pkgdir} install
diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD
index 4d8216793..cc5613192 100644
--- a/core/wireless_tools/PKGBUILD
+++ b/core/wireless_tools/PKGBUILD
@@ -12,8 +12,8 @@ groups=('base')
 license=('GPL')
 depends=()
 backup=('opt/etc/conf.d/wireless')
-source=('http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz'
-		'wireless.conf.d')
+source=(http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/$pkgname.$pkgver.tar.gz
+	wireless.conf.d)
 md5sums=('e06c222e186f7cc013fd272d023710cb'
          '027576534885b8d5dded9be546057b12')
 
diff --git a/core/wpa_supplicant/PKGBUILD b/core/wpa_supplicant/PKGBUILD
index e4ca316a8..1d241e1f1 100644
--- a/core/wpa_supplicant/PKGBUILD
+++ b/core/wpa_supplicant/PKGBUILD
@@ -13,30 +13,30 @@ license=('GPL')
 groups=('base')
 backup=('opt/etc/wpa_supplicant.conf')
 url="http://hostap.epitest.fi/wpa_supplicant"
-source=('http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz'
-        'config'
-        'Makefile')
+source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz
+        config
+        Makefile)
 md5sums=('0efb8fcedf0a8acf6f423dfdb0658fdd'
          '7b74567825df411fbc2f43b2642e547d'
          'd94c65954602146834b92a7a354f75eb')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-  cp ${srcdir}/config ./.config
+  cd "$srcdir/$pkgname-$pkgver/$pkgname"
+  cp $srcdir/config ./.config
   rm Makefile
   cp $srcdir/Makefile .
   sed -i 's@/opt/local@$(PREFIX)@g' Makefile
   make || return 1
-  make PREFIX=/opt DESTDIR="${pkgdir}" install || return 1
-  install -m755 -d "${pkgdir}/opt/etc"
-  install -m644 wpa_supplicant.conf "${pkgdir}/opt/etc/wpa_supplicant.conf" || return 1
-  install -d -m755 ${pkgdir}/opt/share/man/man{5,8} || return 1
-  install -m644 doc/docbook/wpa_supplicant.conf.5 "${pkgdir}/opt/share/man/man5/" || return 1
-  install -m644 doc/docbook/{wpa_background,wpa_cli,wpa_passphrase,wpa_supplicant}.8 "${pkgdir}/opt/share/man/man8/" || return 1
+  make PREFIX=/opt DESTDIR="$pkgdir" install || return 1
+  install -m755 -d "$pkgdir/opt/etc"
+  install -m644 wpa_supplicant.conf "$pkgdir/opt/etc/wpa_supplicant.conf" || return 1
+  install -d -m755 $pkgdir/opt/share/man/man{5,8} || return 1
+  install -m644 doc/docbook/wpa_supplicant.conf.5 "$pkgdir/opt/share/man/man5/" || return 1
+  install -m644 doc/docbook/{wpa_background,wpa_cli,wpa_passphrase,wpa_supplicant}.8 "$pkgdir/opt/share/man/man8/" || return 1
 
-  install -m755 -d "${pkgdir}/opt/share/dbus-1/system-services"
-  install -m644 dbus-wpa_supplicant.service "${pkgdir}/opt/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service" || return 1
-  sed -e 's/sbin/opt\/sbin/' -i "${pkgdir}/opt/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service" || return 1
-  install -m755 -d "${pkgdir}/opt/etc/dbus-1/system.d"
-  install -m644 dbus-wpa_supplicant.conf "${pkgdir}/opt/etc/dbus-1/system.d/fi.epitest.hostap.WPASupplicant.conf" || return 1
+  install -m755 -d "$pkgdir/opt/share/dbus-1/system-services"
+  install -m644 dbus-wpa_supplicant.service "$pkgdir/opt/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service" || return 1
+  sed -e 's/sbin/opt\/sbin/' -i "$pkgdir/opt/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service" || return 1
+  install -m755 -d "$pkgdir/opt/etc/dbus-1/system.d"
+  install -m644 dbus-wpa_supplicant.conf "$pkgdir/opt/etc/dbus-1/system.d/fi.epitest.hostap.WPASupplicant.conf" || return 1
 }
diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD
index fa9475566..4f7718d59 100644
--- a/core/xinetd/PKGBUILD
+++ b/core/xinetd/PKGBUILD
@@ -11,20 +11,20 @@ license=('custom')
 depends=('tcp_wrappers')
 optdepends=('perl: for xconv.pl script')
 backup=('opt/etc/xinetd.conf' 'opt/etc/xinetd.d/servers' 'opt/etc/xinetd.d/services')
-source=('http://www.xinetd.org/xinetd-$pkgver.tar.gz'
-		'xinetd.conf'
-		'xinetd'
-        'servers'
-        'services')
+source=(http://www.xinetd.org/$pkgname-$pkgver.tar.gz
+	xinetd.conf
+	xinetd
+        servers
+        services)
 md5sums=('567382d7972613090215c6c54f9b82d9'
-		 '3a6862fd5c45217e23c3151e556ccb5a'
+	 '3a6862fd5c45217e23c3151e556ccb5a'
          '86be3a85c090c7fb3f7207b7a34e54c9'
          '21f47b4aa20921cfaddddd9f9a407f81'
          '9fa2061dc7dd738c8424251deb86f81e')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  sed -i "s#${prefix}/man#${prefix}/share/man#" configure
+  sed -i "s#${prefix}/man#opt/share/man#" configure
   ./configure --prefix=/opt --with-libwrap
   make || return 1
   make prefix=$pkgdir/opt install
diff --git a/core/xz-utils/PKGBUILD b/core/xz-utils/PKGBUILD
index 7ea312c55..ce1cf8abd 100644
--- a/core/xz-utils/PKGBUILD
+++ b/core/xz-utils/PKGBUILD
@@ -13,7 +13,7 @@ provides=('lzma' 'lzma-utils')
 replaces=('lzma' 'lzma-utils')
 conflicts=('lzma' 'lzma-utils')
 options=('!libtool')
-source=("http://tukaani.org/xz/xz-${pkgver}.tar.gz")
+source=(http://tukaani.org/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('f00967331a487e88d51207fe17c56f52')
 
 build() {
diff --git a/core/zlib/PKGBUILD b/core/zlib/PKGBUILD
index 8a94d040c..5dbe6b2eb 100644
--- a/core/zlib/PKGBUILD
+++ b/core/zlib/PKGBUILD
@@ -10,17 +10,17 @@ license=('custom:zlib')
 url="http://www.zlib.net/"
 groups=('base')
 depends=()
-source=("ftp://ftp.archlinux.org/other/zlib/zlib-${pkgver}.tar.gz")
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('c444cf020e5f0e3323b11f5a2d8af8d3')
 
 build() {
-	cd ${srcdir}/zlib-$pkgver
+	cd $srcdir/zlib-$pkgver
 
 	./configure --prefix=/opt --shared
 	make || return 1
-	make install prefix=${pkgdir}/opt || return 1
-	chmod 644 ${pkgdir}/opt/lib/libz.a
+	make install prefix=$pkgdir/opt || return 1
+	chmod 644 $pkgdir/opt/lib/libz.a
 
 	grep -A 24 '^  Copyright' zlib.h > license.txt
-	install -Dm644 license.txt ${pkgdir}/opt/share/licenses/zlib/license.txt
+	install -Dm644 license.txt $pkgdir/opt/share/licenses/zlib/license.txt
 }