diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix
new file mode 100644
index 000000000000..355d7a055e8f
--- /dev/null
+++ b/pkgs/tools/typesetting/skribilo/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchurl, pkgconfig, gettext
+, guile, guile-reader, guile-lib
+, ploticus, imagemagick
+, ghostscript, transfig
+, enableEmacs ? false, emacs ? null
+, enableLout ? true, lout ? null
+, enableTex ? true, tex ? null
+, makeWrapper }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+
+  name = "skribilo-${version}";
+  version = "0.9.4";
+
+  src = fetchurl {
+    url = "http://download.savannah.nongnu.org/releases/skribilo/${name}.tar.gz";
+    sha256 = "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf";
+  };
+
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
+
+  buildInputs = [ gettext guile ploticus imagemagick ghostscript transfig ]
+  ++ optional enableEmacs emacs
+  ++ optional enableLout lout
+  ++ optional enableTex tex;
+
+  propagatedBuildInputs = [ guile-reader guile-lib ];
+
+  postInstall = ''
+    wrapProgram $out/bin/skribilo \
+      --prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" \
+      --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site"
+  '';
+
+  meta = {
+    description = "The Ultimate Document Programming Framework";
+    longDescription = ''
+      Skribilo is a free document production tool that takes a
+      structured document representation as its input and renders that
+      document in a variety of output formats: HTML and Info for
+      on-line browsing, and Lout and LaTeX for high-quality hard
+      copies.
+
+      The input document can use Skribilo's markup language to provide
+      information about the document's structure, which is similar to
+      HTML or LaTeX and does not require expertise. Alternatively, it
+      can use a simpler, "markup-less" format that borrows from Emacs'
+      outline mode and from other conventions used in emails, Usenet
+      and text.
+    '';
+    homepage = https://www.nongnu.org/skribilo/;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
+  };
+}
+# TODO: Better Emacs and TeX integration
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5b5b45047e6..ddba989f04cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5034,6 +5034,10 @@ with pkgs;
 
   sipcalc = callPackage ../tools/networking/sipcalc { };
 
+  skribilo = callPackage ../tools/typesetting/skribilo {
+    tex = texlive.combined.scheme-small;
+  };
+
   sleuthkit = callPackage ../tools/system/sleuthkit {};
 
   sleepyhead = callPackage ../applications/misc/sleepyhead {};