diff --git a/pkgs/tools/system/pciutils/builder.sh b/pkgs/tools/system/pciutils/builder.sh
index 1e3954740a5..4cf93bef868 100644
--- a/pkgs/tools/system/pciutils/builder.sh
+++ b/pkgs/tools/system/pciutils/builder.sh
@@ -5,14 +5,6 @@ preBuild() {
   bunzip2 < $pciids > pci.ids
 }
 
-postInstall=postInstall
-postInstall() {
-  ensureDir $out/lib
-  ensureDir $out/include/pci
-  cp lib/*.h $out/include/pci
-  cp lib/libpci.a $out/lib
-}
-
-makeFlags="PREFIX=$out"
+makeFlags="PREFIX=$out $makeFlags"
 
 genericBuild
diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 5dd67574777..92ebcbdad06 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -1,16 +1,29 @@
 {stdenv, fetchurl, zlib}:
 
 stdenv.mkDerivation {
-  name = "pciutils-2.2.8";
+  name = "pciutils-3.0.0";
+  
   builder = ./builder.sh;
+  
   src = fetchurl {
-    url = mirror://kernel/software/utils/pciutils/pciutils-2.2.8.tar.bz2;
-    sha256 = "0hgri2ancnjl56ld2flb9w606dyvr5gly8gsz3bzl71r8s464qsq";
+    url = mirror://kernel/software/utils/pciutils/pciutils-3.0.0.tar.bz2;
+    sha256 = "1q9j7w95ysy6c02j7p3z58y23n5v2cdjwy6hz8s9xzvnlr0ynpnh";
   };
+  
   buildInputs = [zlib];
 
   pciids = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/pci.ids.20080118.bz2;
-    sha256 = "0dl6psdac62llbklxn4dvkzbw1j1sdadw9i4l36vpd6mvqa7lz0a";
+    url = http://nixos.org/tarballs/pci.ids.20080830.bz2;
+    sha256 = "0nfjj9lsifmm6js9w0isrscirr1a7dj9ynppbc0g5i19rzrmwafy";
+  };
+
+  # Override broken auto-detect logic.
+  makeFlags = "ZLIB=yes DNS=yes";
+
+  installTargets = "install install-lib";
+
+  meta = {
+    homepage = http://mj.ucw.cz/pciutils.shtml;
+    description = "A collection of programs for inspecting and manipulating configuration of PCI devices";
   };
 }