diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix
new file mode 100644
index 000000000000..b2aa4de40c02
--- /dev/null
+++ b/pkgs/applications/window-managers/cwm/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "cwm-5.6";
+
+  src = fetchFromGitHub {
+      owner = "chneukirchen";
+      repo = "cwm";
+      rev = "b7a8c11750d11721a897fdb8442d52f15e7a24a0";
+      sha256 = "0a0x8rgqif4kxy7hj70hck7jma6c8jy4428ybl8fz9qxgxh014ml";
+  };
+
+  buildInputs = [ libX11 libXinerama libXrandr libXft yacc pkgconfig ];
+
+  prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
+
+  meta = with stdenv.lib; {
+    description = "A lightweight and efficient window manager for X11";
+    homepage = https://github.com/chneukirchen/cwm;
+    maintainers = [];
+    license     = licenses.isc;
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62c598795044..1e0a94fbd60d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11290,6 +11290,8 @@ let
 
   cvs2svn = callPackage ../applications/version-management/cvs2svn { };
 
+  cwm = callPackage ../applications/window-managers/cwm { };
+
   cyclone = callPackage ../applications/audio/pd-plugins/cyclone  { };
 
   d4x = callPackage ../applications/misc/d4x { };