diff --git a/pkgs/os-specific/linux/wpa_supplicant/builder-gui-qt4.sh b/pkgs/os-specific/linux/wpa_supplicant/builder-gui-qt4.sh
new file mode 100644
index 000000000000..36d2e1498c64
--- /dev/null
+++ b/pkgs/os-specific/linux/wpa_supplicant/builder-gui-qt4.sh
@@ -0,0 +1,12 @@
+source $stdenv/setup
+
+tar xfvz $src
+cd $pkgname-$version/wpa_supplicant
+cp defconfig .config
+substituteInPlace Makefile --replace /usr/local $out
+make wpa_gui-qt4
+cd wpa_gui-qt4
+ensureDir $out/bin
+cp wpa_gui $out/bin
+ensureDir $out/share/applications
+cp wpa_gui.desktop $out/share/applications
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 3d3101016ac5..dac9188815a4 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl}:
+{stdenv, fetchurl, openssl, qt4 ? null}:
 
 stdenv.mkDerivation rec {
   name = "wpa_supplicant-0.6.9";
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
     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 ${if qt4 == null then "" else "wpa_gui-qt4"}")
   '';
 
-  buildInputs = [openssl];
+  buildInputs = [openssl qt4];
 
   postInstall = ''
     ensureDir $out/share/man/man5 $out/share/man/man8
diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix b/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix
new file mode 100644
index 000000000000..5901e4379833
--- /dev/null
+++ b/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl, qt4}:
+
+stdenv.mkDerivation rec {
+  pkgname = "wpa_supplicant";
+  version = "0.6.9";
+  name = "${pkgname}-gui-qt4-${version}";
+
+  src = fetchurl {
+    url = "http://hostap.epitest.fi/releases/${pkgname}-${version}.tar.gz";
+    sha256 = "0w7mf3nyilkjsn5v7p15v5fxnh0klgm8c979z80y0mkw7zx88lkf";
+  };
+
+  buildInputs = [qt4];  
+  builder = ./builder-gui-qt4.sh;  
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d63708f1901b..d1e1c954af67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5402,6 +5402,10 @@ let
     inherit fetchurl stdenv openssl;
   };
 
+  wpa_supplicant_gui_qt4 = import ../os-specific/linux/wpa_supplicant/gui-qt4.nix {
+    inherit fetchurl stdenv qt4;
+  };
+
   xfsProgs = builderDefsPackage (selectVersion ../os-specific/linux/xfsprogs "2.9.7-1"){
     inherit libtool gettext e2fsprogs;
   };