diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix
new file mode 100644
index 00000000000..ad23ed7e9dc
--- /dev/null
+++ b/pkgs/development/tools/stagit/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, libgit2, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "stagit-${version}";
+  version = "0.6";
+
+  src = fetchgit {
+    url = git://git.codemadness.org/stagit;
+    rev = version;
+    sha256 = "1xwjdqkf5akxa66ak7chd9gna89kgbdzjrpx4ch7f770ycp2s5sr";
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  buildInputs = [ libgit2 ];
+
+  meta = with stdenv.lib; {
+    description = "git static site generator";
+    homepage = https://git.codemadness.org/stagit/;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jb55 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9d455fe31d..b53d9d0532e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1139,6 +1139,8 @@ with pkgs;
 
   staccato = callPackage ../tools/text/staccato { };
 
+  stagit = callPackage ../development/tools/stagit { };
+
   syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {};
 
   syslogng = callPackage ../tools/system/syslog-ng { };