diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix
index 2a8d78b0f0e..c2fb0810ba9 100644
--- a/pkgs/applications/misc/djvulibre/default.nix
+++ b/pkgs/applications/misc/djvulibre/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "djvulibre-3.5.19";
+  name = "djvulibre-3.5.21";
 
   src = fetchurl {
-    url = mirror://sourceforge/djvu/djvulibre-3.5.19.tar.gz;
-    sha256 = "0y6d9ka42llm7h64fc73s4wqcbxg31kallyfaarhkqsxyiaa3zsp";
+    url = mirror://sourceforge/djvu/djvulibre-3.5.21.tar.gz;
+    sha256 = "39f80c1810be22c5ea7f6a44bbb449c3e29902895dcff9da6a8440891a67b8b4";
   };
 
   buildInputs = [qt libX11 libjpeg libtiff libpng ghostscript zlib libungif x11 mesa];
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index c0abe7900f9..6e3d649fc20 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
     ++ (if qt4Support then [qt4] else []);
 
   configureFlags = "--enable-shared --disable-static --enable-exceptions
-    --enable-cairo --enable-splash --enable-poppler-glib --enable-zlib "
+    --enable-cairo --enable-splash --enable-poppler-glib --enable-zlib
+    --enable-xpdf-headers "
     + (if qt4Support then "--enable-qt-poppler" else "--disable-qt-poppler");
 
   patches = [ ./GDir-const.patch ./use_exceptions.patch ];
diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix
new file mode 100644
index 00000000000..9a647e08106
--- /dev/null
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
+
+stdenv.mkDerivation {
+  name = "pdf2djvu-0.5.3";
+
+  src = fetchurl {
+    url = http://pdf2djvu.googlecode.com/files/pdf2djvu_0.5.3.tar.gz;
+    sha256 = "b36b958fc395dc8976485bef09aac2b97435d0d9f21b4cf8dacaa5b55f3f2c1c";
+  };
+
+  buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];
+
+  meta = {
+    description = "Creates djvu files from PDF files";
+    homepage = http://code.google.com/p/pdf2djvu/;
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ecef6ba3923..7062b71ba87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1087,6 +1087,10 @@ let
     inherit fetchurl stdenv zlib;
   };
 
+  pdf2djvu = import ../tools/typesetting/pdf2djvu {
+    inherit fetchurl stdenv pkgconfig djvulibre poppler fontconfig libjpeg;
+  };
+
   pdfjam = import ../tools/typesetting/pdfjam {
     inherit fetchurl stdenv;
   };