diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 584723c9b45..3d3101016ac 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,19 +1,30 @@
 {stdenv, fetchurl, openssl}:
 
-stdenv.mkDerivation {
-  name = "wpa_supplicant-0.6.3";
+stdenv.mkDerivation rec {
+  name = "wpa_supplicant-0.6.9";
 
   src = fetchurl {
-    url = http://hostap.epitest.fi/releases/wpa_supplicant-0.6.3.tar.gz;
-    sha256 = "f70b18243e049bbda66254388b6e94d404e747d913b8496d6e93a9c56bbf4af2";
+    url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
+    sha256 = "0w7mf3nyilkjsn5v7p15v5fxnh0klgm8c979z80y0mkw7zx88lkf";
   };
 
-  preBuild = "
+  preBuild = ''
     cd wpa_supplicant
     cp defconfig .config
     substituteInPlace Makefile --replace /usr/local $out
-    makeFlagsArray=(ALL=\"wpa_supplicant wpa_passphrase wpa_cli\")
-  ";
+    makeFlagsArray=(ALL="wpa_supplicant wpa_passphrase wpa_cli")
+  '';
 
   buildInputs = [openssl];
+
+  postInstall = ''
+    ensureDir $out/share/man/man5 $out/share/man/man8
+    cp doc/docbook/*.5 $out/share/man/man5/
+    cp doc/docbook/*.8 $out/share/man/man8/
+  '';
+
+  meta = {
+    homepage = http://hostap.epitest.fi/wpa_supplicant/;
+    description = "A tool for connecting to WPA and WPA2-protected wireless networks";
+  };
 }