diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix
new file mode 100644
index 00000000000..2b146a78cb3
--- /dev/null
+++ b/pkgs/applications/window-managers/windowmaker/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, libX11, libXft, libXmu }:
+
+stdenv.mkDerivation rec {
+  name = "windowmaker-${version}";
+  version = "0.95.4";
+
+  src = fetchurl {
+    url = "http://windowmaker.org/pub/source/release/"
+        + "WindowMaker-${version}.tar.gz";
+    sha256 = "0icffqnmkkjjf412m27wljbf9vxb2ry4aiyi2pqmzw3h0pq9gsib";
+  };
+
+  buildInputs = [ pkgconfig libX11 libXft libXmu ];
+
+  meta = {
+    homepage = "http://windowmaker.org/";
+    description = "NeXTSTEP-like window manager";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15590b8448a..4694040bf24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8635,6 +8635,8 @@ let
     };
   };
 
+  windowmaker = callPackage ../applications/window-managers/windowmaker { };
+
   winswitch = callPackage ../tools/X11/winswitch { };
 
   wings = callPackage ../applications/graphics/wings {