diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d835c917e2e..816917397fc 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -434,6 +434,7 @@
   mjanczyk = "Marcin Janczyk <m@dragonvr.pl>";
   mjp = "Mike Playle <mike@mythik.co.uk>"; # github = "MikePlayle";
   mlieberman85 = "Michael Lieberman <mlieberman85@gmail.com>";
+  moaxcp = "John Mercier <moaxcp@gmail.com>";
   modulistic = "Pablo Costa <modulistic@gmail.com>";
   mog = "Matthew O'Gorman <mog-lists@rldn.net>";
   montag451 = "montag451 <montag451@laposte.net>";
diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
new file mode 100644
index 00000000000..5bc649ece86
--- /dev/null
+++ b/pkgs/development/tools/jbake/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, unzip, jre, ...}:
+
+stdenv.mkDerivation rec {
+    version = "2.5.1";
+    name = "jbake-${version}";
+    src = fetchurl {
+        url = "http://jbake.org/files/jbake-${version}-bin.zip";
+        sha256="1r46y84q5x915055hx2vxydaqng3cz0clwz0yhwapgmi4sliygjd";
+    };
+
+    buildInputs = [ unzip jre ];
+
+    unpackPhase = "unzip ${src}";
+
+    installPhase = ''
+        substituteInPlace $name/bin/jbake --replace "java" "${jre}/bin/java" 
+        mkdir -p $out
+        cp -r $name/* $out
+    '';
+
+    meta = with stdenv; {
+        description = "JBake is a Java based, open source, static site/blog generator for developers & designers";
+        homepage = "http://jbake.org/";
+        license = lib.licenses.mit;
+        maintainers = with lib.maintainers; [moaxcp];
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1caabba1b3a..65018de2ab6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7500,6 +7500,8 @@ with pkgs;
 
   jamomacore = callPackage ../development/libraries/audio/jamomacore { };
 
+  jbake = callPackage ../development/tools/jbake { };
+
   jikespg = callPackage ../development/tools/parsing/jikespg { };
 
   jenkins = callPackage ../development/tools/continuous-integration/jenkins { };