diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix
new file mode 100644
index 000000000000..3ce50a82915a
--- /dev/null
+++ b/pkgs/applications/window-managers/herbstluftwm/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, glib, libX11, libXinerama }:
+
+stdenv.mkDerivation rec {
+  name = "herbstluftwm-0.5.2";
+
+  src = fetchurl {
+    url = "http://herbstluftwm.org/tarballs/${name}.tar.gz";
+    sha256 = "15crb77gw8p1h721r3dcgn0m1n03qk0g81rrnaqw8p7hz44k6gf5";
+  };
+
+  patchPhase = ''
+      sed -i -e "s:/usr/local:$\{out}:" \
+             -e "s:/etc:$\{out}/etc:" \
+          config.mk
+  '';
+
+  buildInputs = [ pkgconfig glib libX11 libXinerama ];
+
+  meta = {
+    description = "A manual tiling window manager for X";
+    homepage = "http://herbstluftwm.org/";
+    license = "BSD"; # Simplified BSD License
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef0b595d153c..b912ae4d2ee7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7704,6 +7704,8 @@ let
 
   hello = callPackage ../applications/misc/hello/ex-2 { };
 
+  herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
+
   hexedit = callPackage ../applications/editors/hexedit { };
 
   hetznerNixOpsInstaller =