diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
new file mode 100644
index 000000000000..39f92d99b7f6
--- /dev/null
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, libnl1, openssl }:
+stdenv.mkDerivation rec {
+
+  name = "hostapd-${version}";
+  version = "0.7.3";
+
+  src = fetchurl {
+    url = http://w1.fi/releases/hostapd-0.7.3.tar.gz;
+    sha256 = "0rqmjs4k50qjp2d0k71lg5vsh34w07w985cxjqklq6kyyf0jgsri";
+  };
+
+  buildInputs = [ libnl1 openssl ];
+
+  configurePhase = ''
+    cd hostapd
+    substituteInPlace defconfig --replace "#CONFIG_DRIVER_NL80211" "CONFIG_DRIVER_NL80211"
+    substituteInPlace Makefile --replace "/usr/local/bin/" "$out/bin/"
+    mv defconfig .config
+  '';
+  preInstall = "mkdir -p $out/bin";
+
+  meta = with stdenv.lib; {
+    homepage = http://w1.fi/hostapd/;
+    description = "A user space daemon for access point and authentication servers";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 500d6c47f5b3..5ec5044bb81b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4928,6 +4928,8 @@ let
 
   hibernate = callPackage ../os-specific/linux/hibernate { };
 
+  hostapd = callPackage ../os-specific/linux/hostapd { };
+
   htop = callPackage ../os-specific/linux/htop { };
 
   hurdCross = forceBuildDrv(import ../os-specific/gnu/hurd {