diff --git a/acl/PKGBUILD b/acl/PKGBUILD
index 3c3b8ffb7..c26e9202b 100644
--- a/acl/PKGBUILD
+++ b/acl/PKGBUILD
@@ -1,23 +1,16 @@
 #
 # 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>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# maintainer abveritas@chakra-project.org
 
 pkgname=acl
 pkgver=2.2.51
-pkgrel=2
+pkgrel=3
 pkgdesc="Library for filesystem ACL support"
 arch=('i686' 'x86_64')
 url="http://savannah.nongnu.org/projects/acl"
 license=('LGPL')
 depends=('attr>=2.4.46')
-replaces=('xfsacl')
-provides=('xfsacl')
-conflicts=('xfsacl')
 options=('!libtool')
 source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz)
 sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225')
@@ -26,7 +19,7 @@ build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
   export INSTALL_USER=root INSTALL_GROUP=root 
-  ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib
+  ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib
   make 
 }
 
@@ -36,6 +29,6 @@ package() {
   make DIST_ROOT="${pkgdir}" install install-lib install-dev
 
   # tidy up
-  rm -f ${pkgdir}/lib/libacl.a
-  chmod 0755 ${pkgdir}/lib/libacl.so.*.*.*
+  rm -f ${pkgdir}/usr/lib/libacl.a
+  chmod 0755 ${pkgdir}/usr/lib/libacl.so.*.*.*
 }
diff --git a/attr/PKGBUILD b/attr/PKGBUILD
index bb36b4704..0c9426343 100644
--- a/attr/PKGBUILD
+++ b/attr/PKGBUILD
@@ -1,15 +1,11 @@
 #
 # 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>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# maintainer abveritas@chakra-project.org
 
 pkgname=attr
 pkgver=2.4.46
-pkgrel=2
+pkgrel=3
 pkgdesc="Extended attribute support library for ACL support"
 arch=(i686 x86_64)
 url="http://oss.sgi.com/projects/xfs/"
@@ -17,9 +13,6 @@ license=('LGPL')
 groups=('base')
 depends=('glibc') 
 makedepends=('gettext')
-replaces=('xfsattr')
-provides=('xfsattr')
-conflicts=('xfsattr')
 options=('!libtool')
 source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz)
 sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f')
@@ -28,7 +21,7 @@ build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   
   export INSTALL_USER=root INSTALL_GROUP=root
-  ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib
+  ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib
   make
 }
 
@@ -38,8 +31,8 @@ package() {
   make DIST_ROOT="${pkgdir}" install install-lib install-dev
 
   # tidy up
-  rm -f "${pkgdir}"/lib/libattr.a
-  chmod 0755 "${pkgdir}"/lib/libattr.so.*.*.*
+  rm -f "${pkgdir}"/usr/lib/libattr.a
+  chmod 0755 "${pkgdir}"/usr/lib/libattr.so.*.*.*
   # remove conflicting manpages
   rm -rf "${pkgdir}"/usr/share/man/man2
 }
diff --git a/libcap/PKGBUILD b/libcap/PKGBUILD
index c246fe4a4..0c86ce5dc 100644
--- a/libcap/PKGBUILD
+++ b/libcap/PKGBUILD
@@ -1,19 +1,18 @@
 #
 # Chakra 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=libcap
-pkgver=2.21
-pkgrel=3
+pkgver=2.22
+pkgrel=1
 pkgdesc="POSIX 1003.1e capabilities"
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/pub/linux/libs/security/linux-privs/"
 license=('GPL')
 depends=('glibc' 'attr')
 source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${pkgname}-${pkgver}.tar.gz)
-md5sums=('61966ef40f2dee8731b69db895e4548d')
+md5sums=('b4896816b626bea445f0b3849bdd4077')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -22,7 +21,11 @@ build() {
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make prefix=/usr DESTDIR=${pkgdir} LIBDIR=${pkgdir}/lib RAISE_SETFCAP=no install
-  rm ${pkgdir}/lib/*.a
-  chmod 755 ${pkgdir}/lib/libcap.so.${pkgver}
+  make prefix=/usr DESTDIR=${pkgdir} RAISE_SETFCAP=no install
+
+  chmod 755 ${pkgdir}/usr/lib/libcap.so.${pkgver}
+  rm ${pkgdir}/usr/lib/libcap.a
+
+  install -Dm644 pam_cap/capability.conf \
+    $pkgdir/usr/share/doc/$pkgname/capability.conf.example
 }
diff --git a/vhba-module/60-vhba.rules b/vhba-module/60-vhba.rules
new file mode 100644
index 000000000..91de6f86a
--- /dev/null
+++ b/vhba-module/60-vhba.rules
@@ -0,0 +1 @@
+KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
diff --git a/vhba-module/PKGBUILD b/vhba-module/PKGBUILD
index 3c82e5f89..3cf1501f7 100644
--- a/vhba-module/PKGBUILD
+++ b/vhba-module/PKGBUILD
@@ -16,16 +16,24 @@ license=('GPL2')
 depends=('linux>=3.4' 'linux<3.5')
 makedepends=('linux-headers')
 install=vhba-module.install
-source=(http://sourceforge.net/projects/cdemu/files/vhba-module/vhba-module-$pkgver.tar.bz2)
-md5sums=('d97372da1d270d1605742b2995fb6678')
+source=(http://sourceforge.net/projects/cdemu/files/vhba-module/vhba-module-$pkgver.tar.bz2
+        60-vhba.rules)
+md5sums=('d97372da1d270d1605742b2995fb6678'
+         '549bd2d9696bd1884c8eed7193c00e21')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+
   make -j1 KDIR=/usr/src/linux-${_kver}
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
+
   install -D vhba.ko "$pkgdir/lib/modules/${_extramodules}/vhba.ko"
-  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/vhba-module.install"
+  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" \
+          "${startdir}/vhba-module.install"
+
+  install -Dm644 "$srcdir/60-vhba.rules" \
+	  "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"
 }