diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
new file mode 100644
index 000000000000..3f0f550123ad
--- /dev/null
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -0,0 +1,22 @@
+args: with args;
+
+stdenv.mkDerivation {
+  name="jwm-2.0.1";
+  src = fetchurl {
+     url = http://24.254.249.181:8080/joewing.net/programs/jwm/releases/jwm-2.0.1.tar.bz2;
+     sha256 = "1ix5y00cmg3cyazl0adzgv49140zxaf2dpngyg1dyy4ma6ysdmnw";
+  };
+
+  buildInputs = [libX11 libXext libXinerama libXpm libXft];
+
+
+  postInstall = ''
+    sed -i -e s/rxvt/xterm/g $out/etc/system.jwmrc
+    sed -i -e "s/.*Swallow.*\|.*xload.*//" $out/etc/system.jwmrc'';
+
+
+  meta = {
+  description = "JWM is a window manager for X11 window system. It is written in C and uses only Xlib at a minimum.";
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5523474de64..bf3dafe33d08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5153,6 +5153,11 @@ let pkgs = rec {
     inherit stdenv fetchurl;
   };
 
+  jwm = import ../applications/window-managers/jwm {
+    inherit fetchurl stdenv;
+    inherit (xlibs) libX11 libXext libXinerama libXpm libXft;
+  };
+
   kino = import ../applications/video/kino {
     inherit fetchurl stdenv pkgconfig libxml2 perl perlXMLParser 
       libdv libraw1394 libavc1394 libiec61883 x11 gettext cairo; /* libavformat */