diff --git a/pkgs/os-specific/linux/hwdata/builder.sh b/pkgs/os-specific/linux/hwdata/builder.sh
new file mode 100644
index 000000000000..50d114773240
--- /dev/null
+++ b/pkgs/os-specific/linux/hwdata/builder.sh
@@ -0,0 +1,5 @@
+source $stdenv/setup
+
+export DESTDIR=$out
+
+genericBuild
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
new file mode 100644
index 000000000000..0a9e777646d4
--- /dev/null
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "hwdata-0.159";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.nluug.nl/pub/os/Linux/distr/debian/pool/main/h/hwdata/hwdata_0.159.orig.tar.gz;
+    md5 = "5756e42e70955b15dc62cfcdbaa1c885";
+  };
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index a8810079a37e..84a44a16cff4 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1085,6 +1085,10 @@ rec {
   
   ### OS-SPECIFIC
 
+  hwdata = (import ../os-specific/linux/hwdata) {
+    inherit fetchurl stdenv;
+  };
+
   kernelHeaders = (import ../os-specific/linux/kernel-headers) {
     inherit fetchurl stdenv;
   };
@@ -1097,6 +1101,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  nfsUtils = (import ../os-specific/linux/nfs-utils) {
+    inherit fetchurl stdenv;
+  };
+
   alsaLib = (import ../os-specific/linux/alsa/library) {
     inherit fetchurl stdenv;
   };