diff --git a/pkgs/os-specific/linux/iwlwifi/default.nix b/pkgs/os-specific/linux/iwlwifi/default.nix
new file mode 100644
index 00000000000..9096d71a28a
--- /dev/null
+++ b/pkgs/os-specific/linux/iwlwifi/default.nix
@@ -0,0 +1,36 @@
+{stdenv, fetchurl, kernel}:
+
+stdenv.mkDerivation {
+  name = "iwlwifi-1.2.23";
+
+  src = fetchurl {
+    url = http://www.intellinuxwireless.org/iwlwifi/downloads/iwlwifi-1.2.23.tgz;
+    sha256 = "0a4szjgg5b2jj4ax85lakqa951ph6pw5wpwlrw3mnmvcda5ayiip";
+  };
+
+  preBuild = ''
+    substituteInPlace scripts/generate_compatible \
+      --replace '/usr/bin/env /bin/bash' $shell
+    substituteInPlace Makefile \
+      --replace /sbin/depmod true
+
+    # Urgh, we need the complete kernel sources for some header
+    # files.  So unpack the original kernel source tarball and copy
+    # the configured include directory etc. on top of it.
+    kernelBuild=$(echo ${kernel}/lib/modules/2.6.*/source)
+    tar xvfj ${kernel.src}
+    kernelSource=$(echo $(pwd)/linux-*)
+    cp -prd $kernelBuild/* $kernelSource
+
+    makeFlags=KSRC=$kernelSource
+    make $makeFlags || true
+    make $makeFlags
+
+    installFlags=KMISC=$out
+  ''; # */
+
+  meta = {
+    description = "Intel Wireless WiFi Link drivers for Linux";
+    homepage = http://www.intellinuxwireless.org/;
+  };
+}
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index bf6795f4b1e..f58a360ac8d 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssl}:
 
 stdenv.mkDerivation {
-  name = "wpa_supplicant-0.5.7";
+  name = "wpa_supplicant-0.5.9";
 
   src = fetchurl {
-    url = http://hostap.epitest.fi/releases/wpa_supplicant-0.5.7.tar.gz;
-    sha256 = "0mvb2fpvn7qdjinpn86hvmhfwg2ax1822hdkfrw25wx5dglqns6g";
+    url = http://hostap.epitest.fi/releases/wpa_supplicant-0.5.9.tar.gz;
+    sha256 = "1dylaiikp2jb13jbxdrl1h9b9p2lkjmzx06hpmkcpyq5c5g7p0xy";
   };
 
   preBuild = "
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8bcc3f02ac..dc93bdfe588 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3118,6 +3118,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  iwlwifi = import ../os-specific/linux/iwlwifi {
+    inherit fetchurl stdenv kernel;
+  };
+
   kbd = import ../os-specific/linux/kbd {
     inherit fetchurl stdenv bison flex;
   };