diff --git a/crda/PKGBUILD b/crda/PKGBUILD
index db35c567d..41693a764 100644
--- a/crda/PKGBUILD
+++ b/crda/PKGBUILD
@@ -1,15 +1,14 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas@chakra-project.org
 
 
 pkgname=crda
 pkgver=1.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Central Regulatory Domain Agent"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
 license=('custom')
 depends=('wireless-regdb' 'libnl' 'libgcrypt' 'udev' 'iw')
@@ -28,17 +27,14 @@ build() {
 }
 
 package() {
-  # Install crda, regdbdump and udev rules
-  msg "Installing crda ..."
   cd "${srcdir}"/${pkgname}-${pkgver}
+
   make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ install
   # This rule automatically sets the regulatory domain when cfg80211 is loaded
-  echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/lib/udev/rules.d/85-regulatory.rules
+  echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules
 
-  msg "Installing license ..."
   install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE
-
-  msg "Installing boot script ..."
   install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom
 }
 
diff --git a/rfkill/PKGBUILD b/rfkill/PKGBUILD
index 83b279e2b..f3f2d4591 100644
--- a/rfkill/PKGBUILD
+++ b/rfkill/PKGBUILD
@@ -1,6 +1,7 @@
-# $Id: PKGBUILD 67405 2010-02-06 19:20:13Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+#
+# Core Packages for Chakra, part of chakra-project.org
+#
+# maintainer abveritas@chakra-project.org
 
 pkgname=rfkill
 pkgver=0.4
@@ -22,14 +23,17 @@ md5sums=('727892c0fb35c80ee3849fbe89b45350'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  # License
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
-  # Udev rule
-  install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/lib/udev/rules.d/60-rfkill.rules" || return 1
-  # Init script
-  install -Dm644 "${srcdir}/rfkill.conf.d" "${pkgdir}/etc/conf.d/rfkill" || return 1
-  install -Dm755 "${srcdir}/rfkill.rc.d" "${pkgdir}/etc/rc.d/rfkill" || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  # License
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  # Udev rule
+  install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
+  # Init script
+  install -Dm644 "${srcdir}/rfkill.conf.d" "${pkgdir}/etc/conf.d/rfkill"
+  install -Dm755 "${srcdir}/rfkill.rc.d" "${pkgdir}/etc/rc.d/rfkill"
 }