diff --git a/pciutils/PKGBUILD b/pciutils/PKGBUILD
index eb6f5cc21..90bba2229 100644
--- a/pciutils/PKGBUILD
+++ b/pciutils/PKGBUILD
@@ -1,8 +1,11 @@
-# $Id: PKGBUILD 69314 2010-02-20 10:20:37Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+#
+# Core Packages for Chakra, part of chakra-project.org
+#
+# maintainer abveritas@chakra-project.org
+
 pkgname=pciutils
-pkgver=3.1.7
-pkgrel=2
+pkgver=3.1.9
+pkgrel=1
 pkgdesc="PCI bus configuration space access library and tools"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -11,20 +14,20 @@ url="http://mj.ucw.cz/pciutils.html"
 optdepends=('sh: required by update-pciids') 
 makedepends=('wget')
 depends=('glibc')
-source=(ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('35222edb86b50a6641352c66fe829b2e')
+source=(ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+md5sums=('82b649eb00d12b81ab57f83780bc2bc8')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  CFLAGS="${CFLAGS} -fPIC -DPIC"
-  sed -i -e 's/^OPT=.*/OPT=-O2 -pipe -fPIC -DPIC/g' Makefile
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./update-pciids.sh
-
-  make ZLIB=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all || return 1
-  make PREFIX=${pkgdir}/usr SHAREDIR=${pkgdir}/usr/share/hwdata MANDIR=${pkgdir}/usr/share/man install
-  install -d ${pkgdir}/usr/lib
-  install -m644 lib/libpci.a ${pkgdir}/usr/lib
-  for i in config.h header.h pci.h types.h; do
-    install -D -m 644 lib/${i} ${pkgdir}/usr/include/pci/${i}
-  done
+  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+  cp lib/libpci.a "${srcdir}/"
+  make clean
+  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
+  install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
 }