diff --git a/pkgs/os-specific/linux/wireless-tools/default.nix b/pkgs/os-specific/linux/wireless-tools/default.nix
index d61ce05f1996..1a3922d5970e 100644
--- a/pkgs/os-specific/linux/wireless-tools/default.nix
+++ b/pkgs/os-specific/linux/wireless-tools/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "wireless-tools-29-pre12";
+  name = "wireless-tools-29-pre17";
 
   src = fetchurl {
-    url = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre12.tar.gz;
-    sha256 = "12al9910k2d9a0464j1r1x3lcsyw36zd2hzbyqy357iplplkxnws";
+    url = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre17.tar.gz;
+    sha256 = "13488mk5q8zdb6z933287kf2sf2narkn4khni5z3x7y87jvrs127";
   };
 
   preBuild = "
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
new file mode 100644
index 000000000000..bf6795f4b1ed
--- /dev/null
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, openssl}:
+
+stdenv.mkDerivation {
+  name = "wpa_supplicant-0.5.7";
+
+  src = fetchurl {
+    url = http://hostap.epitest.fi/releases/wpa_supplicant-0.5.7.tar.gz;
+    sha256 = "0mvb2fpvn7qdjinpn86hvmhfwg2ax1822hdkfrw25wx5dglqns6g";
+  };
+
+  preBuild = "
+    cp defconfig .config
+    substituteInPlace Makefile --replace /usr/local $out
+    makeFlagsArray=(ALL=\"wpa_supplicant wpa_passphrase wpa_cli\")
+  ";
+
+  buildInputs = [openssl];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9329945a0010..206e75cd43da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2492,6 +2492,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  wpa_supplicant = import ../os-specific/linux/wpa_supplicant {
+    inherit fetchurl stdenv openssl;
+  };
+
   xorg_sys_opengl = import ../os-specific/linux/opengl/xorg-sys {
     inherit stdenv xlibs expat;
   };