diff --git a/pkgs/os-specific/linux/rfkill/default.nix b/pkgs/os-specific/linux/rfkill/default.nix
new file mode 100644
index 000000000000..0e0f5a3ff0c6
--- /dev/null
+++ b/pkgs/os-specific/linux/rfkill/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "rfkill-0.4";
+  
+  src = fetchurl {
+    url = "http://wireless.kernel.org/download/rfkill/${name}.tar.bz2";
+    sha256 = "1hb884vgyldci648azbx17w83gzynn0svrmfjgh3c2jzga1f846a";
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  meta = {
+    homepage = http://wireless.kernel.org/en/users/Documentation/rfkill;
+    description = "A tool to query, enable and disable wireless devices";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8da577cdf4f1..0945d3f80644 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6358,6 +6358,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  rfkill = import ../os-specific/linux/rfkill {
+    inherit fetchurl stdenv;
+  };
+
   rt73fw = import ../os-specific/linux/firmware/rt73 {
     inherit fetchurl stdenv unzip;
   };